*
* @since 1.21
*/
- protected function checkHasDiff3() {
+ protected function markTestSkippedIfNoDiff3() {
global $wgDiff3;
# This check may also protect against code injection in
public function testAutoMerge( $baseUser, $text, $adamsEdit, $bertasEdit,
$expectedCode, $expectedText, $message = null
) {
- $this->checkHasDiff3();
+ $this->markTestSkippedIfNoDiff3();
// create page
$ns = $this->getDefaultWikitextNS();
* @covers ::wfMerge
*/
public function testMerge( $old, $mine, $yours, $expectedMergeResult, $expectedText ) {
- $this->checkHasDiff3();
+ $this->markTestSkippedIfNoDiff3();
$mergedText = null;
$isMerged = wfMerge( $old, $mine, $yours, $mergedText );
* @covers WikitextContentHandler::merge3
*/
public function testMerge3( $old, $mine, $yours, $expected ) {
- $this->checkHasDiff3();
+ $this->markTestSkippedIfNoDiff3();
// test merge
$oldContent = new WikitextContent( $old );
/* @todo FIXME: fix this!
public function testGetUndoText() {
- $this->checkHasDiff3();
+ $this->markTestSkippedIfNoDiff3();
$text = "one";
$page = $this->createPage( "WikiPageTest_testGetUndoText", $text );