Merge "Change name of section so it does not get confused with Wikidata"

[lhc/web/wiklou.git] / tests / RunSeleniumTests.php

diff --git a/tests/RunSeleniumTests.php b/tests/RunSeleniumTests.php
index dd97c15..28501ea 100644 (file)
--- a/tests/RunSeleniumTests.php
+++ b/tests/RunSeleniumTests.php
@@ -24,12 +24,12 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-$IP = dirname( dirname( __FILE__ ) );
+$IP = dirname( __DIR__ );
 
 define( 'SELENIUMTEST', true );
 
-//require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
-require( dirname( __FILE__ ) . '/../maintenance/Maintenance.php' );
+//require_once( __DIR__ . '/../maintenance/commandLine.inc' );
+require( __DIR__ . '/../maintenance/Maintenance.php' );
 
 require_once( 'PHPUnit/Runner/Version.php' );
 if( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) {
@@ -43,7 +43,7 @@ if( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) {
 require_once( 'PHPUnit/Extensions/SeleniumTestCase.php' );
 include_once( 'PHPUnit/Util/Log/JUnit.php' );
 
-require_once( dirname( __FILE__ ) . "/selenium/SeleniumServerManager.php" );
+require_once( __DIR__ . "/selenium/SeleniumServerManager.php" );
 
 class SeleniumTester extends Maintenance {
        protected $selenium;
@@ -164,7 +164,7 @@ class SeleniumTester extends Maintenance {
                                $seleniumBrowsers,
                                $seleniumTestSuites,
                                $configFile );
-               } else if ( !isset( $wgHooks['SeleniumSettings'] ) ) {
+               } elseif ( !isset( $wgHooks['SeleniumSettings'] ) ) {
                        $this->output("No command line, configuration file or configuration hook found.\n");
                        SeleniumConfig::getSeleniumSettings( $seleniumSettings,
                                $seleniumBrowsers,