Make these tests run again. I think this is the right fix. At least they run now.
authorPriyanka Dhanda <pdhanda@users.mediawiki.org>
Wed, 15 Dec 2010 23:00:11 +0000 (23:00 +0000)
committerPriyanka Dhanda <pdhanda@users.mediawiki.org>
Wed, 15 Dec 2010 23:00:11 +0000 (23:00 +0000)
tests/RunSeleniumTests.php
tests/selenium/suites/MediaWikiEditorConfig.php

index 33aab53..ec20b5e 100644 (file)
@@ -26,7 +26,8 @@
 
 define( 'SELENIUMTEST', true );
 
-require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
+//require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
+require( dirname( __FILE__ ) . '/../maintenance/Maintenance.php' );
 require_once( 'PHPUnit/Framework.php' );
 require_once( 'PHPUnit/Extensions/SeleniumTestCase.php' );
 include_once( 'PHPUnit/Util/Log/JUnit.php' );
@@ -167,8 +168,8 @@ class SeleniumTester extends Maintenance {
                // State for starting/stopping the Selenium server has nothing to do with the Selenium
                // class. Keep this state local to SeleniumTester class. Using getOption() is clumsy, but
                // the Maintenance class does not have a setOption()
-               if ( isset( $seleniumSettings['startserver'] ) ) $this->getOption( 'startserver', true );
-               if ( isset( $seleniumSettings['stopserver'] ) ) $this->getOption( 'stopserver', true );
+               if ( isset( $seleniumSettings['startserver'] ) ) $this->getOption( 'startserver', true );
+               if ( isset( $seleniumSettings['stopserver'] ) ) $this->getOption( 'stopserver', true );
                if ( !isset( $seleniumSettings['seleniumserverexecpath'] ) ) $seleniumSettings['seleniumserverexecpath'] = '';
                $this->seleniumServerExecPath = $seleniumSettings['seleniumserverexecpath'];
 
index c13f185..c2a8164 100644 (file)
@@ -32,7 +32,8 @@ class MediaWikiEditorConfig {
     public static function getSettings(&$includeFiles, &$globalConfigs) {
         $includes = array(
                 //files that needed to be included would go here
-                'tests/selenium/suites/MediaWikiCommonFunction.php'
+                //commenting out because this does not exist
+                //'tests/selenium/suites/MediaWikiCommonFunction.php'
         );
         $configs = array(
                 'wgPageLoadTime' => "600000"