Merge "(bug 17808) (bug 21167) use real links for search suggestions"

[lhc/web/wiklou.git] / tests / phpunit / includes / EditPageTest.php

diff --git a/tests/phpunit/includes/EditPageTest.php b/tests/phpunit/includes/EditPageTest.php
index b02b08a..36fde85 100644 (file)
--- a/tests/phpunit/includes/EditPageTest.php
+++ b/tests/phpunit/includes/EditPageTest.php
@@ -356,25 +356,13 @@ hello
                return array_merge( $tests, $testsWithAdam, $testsWithBerta );
        }
 
-       function testHasValidDiff3() {
-               global $wgDiff3;
-
-               if ( !$wgDiff3 ) {
-                       $this->markTestSkipped( "Can't test conflict resolution because \$wgDiff3 is not configured" );
-               } elseif ( !file_exists( $wgDiff3 ) ) {
-                       #XXX: this sucks, since it uses arcane internal knowledge about TextContentHandler::merge3 and wfMerge.
-                       $this->markTestSkipped( "Can't test conflict resolution because \$wgDiff3 is misconfigured: can't find $wgDiff3" );
-               }
-               $this->assertTrue( true );
-       }
-
        /**
-        * @depend testHasValidDiff3
         * @dataProvider provideAutoMerge
         */
        public function testAutoMerge( $baseUser, $text, $adamsEdit, $bertasEdit,
                                $expectedCode, $expectedText, $message = null
        ) {
+               $this->checkHasDiff3();
 
                //create page
                $ns = $this->getDefaultWikitextNS();