From 1b4bd529e85de073cfa0851e3766559f269aaea0 Mon Sep 17 00:00:00 2001 From: Priyanka Dhanda Date: Wed, 15 Dec 2010 23:00:11 +0000 Subject: [PATCH] Make these tests run again. I think this is the right fix. At least they run now. --- tests/RunSeleniumTests.php | 7 ++++--- tests/selenium/suites/MediaWikiEditorConfig.php | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/RunSeleniumTests.php b/tests/RunSeleniumTests.php index 33aab53be1..ec20b5e776 100644 --- a/tests/RunSeleniumTests.php +++ b/tests/RunSeleniumTests.php @@ -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']; diff --git a/tests/selenium/suites/MediaWikiEditorConfig.php b/tests/selenium/suites/MediaWikiEditorConfig.php index c13f18594d..c2a8164b61 100644 --- a/tests/selenium/suites/MediaWikiEditorConfig.php +++ b/tests/selenium/suites/MediaWikiEditorConfig.php @@ -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" -- 2.20.1