diff options
Diffstat (limited to 'tests/selenium')
22 files changed, 38 insertions, 72 deletions
diff --git a/tests/selenium/SeleniumConfig.php b/tests/selenium/SeleniumConfig.php index b1487154..04cf8d88 100644 --- a/tests/selenium/SeleniumConfig.php +++ b/tests/selenium/SeleniumConfig.php @@ -24,12 +24,7 @@ class SeleniumConfig { throw new MWException( "Unable to read local Selenium Settings from " . $seleniumConfigFile . "\n" ); } - if ( !defined( 'PHP_VERSION_ID' ) || - ( PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3 ) ) { - $configArray = self::parse_5_2_ini_file( $seleniumConfigFile ); - } else { - $configArray = parse_ini_file( $seleniumConfigFile, true ); - } + $configArray = parse_ini_file( $seleniumConfigFile, true ); if ( $configArray === false ) { throw new MWException( "Error parsing " . $seleniumConfigFile . "\n" ); } @@ -61,35 +56,6 @@ class SeleniumConfig { return true; } - /** - * PHP 5.2 parse_ini_file() doesn't have support for array keys. - * This function parses simple ini files with such syntax using just - * 5.2 functions. - */ - private static function parse_5_2_ini_file( $ConfigFile ) { - $file = fopen( $ConfigFile, "rt" ); - if ( !$file ) { - return false; - } - $header = ''; - - $configArray = array(); - - while ( ( $line = fgets( $file ) ) !== false ) { - $line = strtok( $line, "\r\n" ); - - if ( !$line || $line[0] == ';' ) continue; - - if ( $line[0] == '[' && substr( $line, -1 ) == ']' ) { - $header = substr( $line, 1, -1 ); - $configArray[$header] = array(); - } else { - $configArray[$header] = array_merge_recursive( $configArray[$header], self::parse_ini_line( $line ) ); - } - } - return $configArray; - } - private static function parse_ini_line( $iniLine ) { static $specialValues = array( 'false' => false, 'true' => true, 'null' => null ); list( $key, $value ) = explode( '=', $iniLine, 2 ); diff --git a/tests/selenium/data/SimpleSeleniumTestDB.sql b/tests/selenium/data/SimpleSeleniumTestDB.sql index 1a3196c3..d688c3b9 100644 --- a/tests/selenium/data/SimpleSeleniumTestDB.sql +++ b/tests/selenium/data/SimpleSeleniumTestDB.sql @@ -347,7 +347,7 @@ CREATE TABLE `mw_interwiki` ( LOCK TABLES `mw_interwiki` WRITE; /*!40000 ALTER TABLE `mw_interwiki` DISABLE KEYS */; -INSERT INTO `mw_interwiki` VALUES ('acronym','http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=$1','','',0,0),('advogato','http://www.advogato.org/$1','','',0,0),('annotationwiki','http://www.seedwiki.com/page.cfm?wikiid=368&doc=$1','','',0,0),('arxiv','http://www.arxiv.org/abs/$1','','',0,0),('c2find','http://c2.com/cgi/wiki?FindPage&value=$1','','',0,0),('cache','http://www.google.com/search?q=cache:$1','','',0,0),('commons','http://commons.wikimedia.org/wiki/$1','','',0,0),('corpknowpedia','http://corpknowpedia.org/wiki/index.php/$1','','',0,0),('dictionary','http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=$1','','',0,0),('disinfopedia','http://www.disinfopedia.org/wiki.phtml?title=$1','','',0,0),('docbook','http://wiki.docbook.org/topic/$1','','',0,0),('doi','http://dx.doi.org/$1','','',0,0),('drumcorpswiki','http://www.drumcorpswiki.com/index.php/$1','','',0,0),('dwjwiki','http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1','','',0,0),('elibre','http://enciclopedia.us.es/index.php/$1','','',0,0),('emacswiki','http://www.emacswiki.org/cgi-bin/wiki.pl?$1','','',0,0),('foldoc','http://foldoc.org/?$1','','',0,0),('foxwiki','http://fox.wikis.com/wc.dll?Wiki~$1','','',0,0),('freebsdman','http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=$1','','',0,0),('gej','http://www.esperanto.de/cgi-bin/aktivikio/wiki.pl?$1','','',0,0),('gentoo-wiki','http://gentoo-wiki.com/$1','','',0,0),('google','http://www.google.com/search?q=$1','','',0,0),('googlegroups','http://groups.google.com/groups?q=$1','','',0,0),('hammondwiki','http://www.dairiki.org/HammondWiki/$1','','',0,0),('hewikisource','http://he.wikisource.org/wiki/$1','','',1,0),('hrwiki','http://www.hrwiki.org/index.php/$1','','',0,0),('imdb','http://us.imdb.com/Title?$1','','',0,0),('jargonfile','http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=$1','','',0,0),('jspwiki','http://www.jspwiki.org/wiki/$1','','',0,0),('keiki','http://kei.ki/en/$1','','',0,0),('kmwiki','http://kmwiki.wikispaces.com/$1','','',0,0),('linuxwiki','http://linuxwiki.de/$1','','',0,0),('lojban','http://www.lojban.org/tiki/tiki-index.php?page=$1','','',0,0),('lqwiki','http://wiki.linuxquestions.org/wiki/$1','','',0,0),('lugkr','http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?$1','','',0,0),('mathsongswiki','http://SeedWiki.com/page.cfm?wikiid=237&doc=$1','','',0,0),('meatball','http://www.usemod.com/cgi-bin/mb.pl?$1','','',0,0),('mediawikiwiki','http://www.mediawiki.org/wiki/$1','','',0,0),('mediazilla','https://bugzilla.wikimedia.org/$1','','',1,0),('memoryalpha','http://www.memory-alpha.org/en/index.php/$1','','',0,0),('metawiki','http://sunir.org/apps/meta.pl?$1','','',0,0),('metawikipedia','http://meta.wikimedia.org/wiki/$1','','',0,0),('moinmoin','http://purl.net/wiki/moin/$1','','',0,0),('mozillawiki','http://wiki.mozilla.org/index.php/$1','','',0,0),('mw','http://www.mediawiki.org/wiki/$1','','',0,0),('oeis','http://www.research.att.com/cgi-bin/access.cgi/as/njas/sequences/eisA.cgi?Anum=$1','','',0,0),('openfacts','http://openfacts.berlios.de/index.phtml?title=$1','','',0,0),('openwiki','http://openwiki.com/?$1','','',0,0),('pmeg','http://www.bertilow.com/pmeg/$1.php','','',0,0),('ppr','http://c2.com/cgi/wiki?$1','','',0,0),('pythoninfo','http://wiki.python.org/moin/$1','','',0,0),('rfc','http://www.rfc-editor.org/rfc/rfc$1.txt','','',0,0),('s23wiki','http://is-root.de/wiki/index.php/$1','','',0,0),('seattlewiki','http://seattle.wikia.com/wiki/$1','','',0,0),('seattlewireless','http://seattlewireless.net/?$1','','',0,0),('senseislibrary','http://senseis.xmp.net/?$1','','',0,0),('sourceforge','http://sourceforge.net/$1','','',0,0),('squeak','http://wiki.squeak.org/squeak/$1','','',0,0),('susning','http://www.susning.nu/$1','','',0,0),('svgwiki','http://wiki.svg.org/$1','','',0,0),('tavi','http://tavi.sourceforge.net/$1','','',0,0),('tejo','http://www.tejo.org/vikio/$1','','',0,0),('theopedia','http://www.theopedia.com/$1','','',0,0),('tmbw','http://www.tmbw.net/wiki/$1','','',0,0),('tmnet','http://www.technomanifestos.net/?$1','','',0,0),('tmwiki','http://www.EasyTopicMaps.com/?page=$1','','',0,0),('twiki','http://twiki.org/cgi-bin/view/$1','','',0,0),('uea','http://www.tejo.org/uea/$1','','',0,0),('unreal','http://wiki.beyondunreal.com/wiki/$1','','',0,0),('usemod','http://www.usemod.com/cgi-bin/wiki.pl?$1','','',0,0),('vinismo','http://vinismo.com/en/$1','','',0,0),('webseitzwiki','http://webseitz.fluxent.com/wiki/$1','','',0,0),('why','http://clublet.com/c/c/why?$1','','',0,0),('wiki','http://c2.com/cgi/wiki?$1','','',0,0),('wikia','http://www.wikia.com/wiki/$1','','',0,0),('wikibooks','http://en.wikibooks.org/wiki/$1','','',1,0),('wikicities','http://www.wikia.com/wiki/$1','','',0,0),('wikif1','http://www.wikif1.org/$1','','',0,0),('wikihow','http://www.wikihow.com/$1','','',0,0),('wikimedia','http://wikimediafoundation.org/wiki/$1','','',0,0),('wikinews','http://en.wikinews.org/wiki/$1','','',1,0),('wikinfo','http://www.wikinfo.org/index.php/$1','','',0,0),('wikipedia','http://en.wikipedia.org/wiki/$1','','',1,0),('wikiquote','http://en.wikiquote.org/wiki/$1','','',1,0),('wikisource','http://wikisource.org/wiki/$1','','',1,0),('wikispecies','http://species.wikimedia.org/wiki/$1','','',1,0),('wikitravel','http://wikitravel.org/en/$1','','',0,0),('wikiversity','http://en.wikiversity.org/wiki/$1','','',1,0),('wikt','http://en.wiktionary.org/wiki/$1','','',1,0),('wiktionary','http://en.wiktionary.org/wiki/$1','','',1,0),('wlug','http://www.wlug.org.nz/$1','','',0,0),('zwiki','http://zwiki.org/$1','','',0,0),('zzz wiki','http://wiki.zzz.ee/index.php/$1','','',0,0); +INSERT INTO `mw_interwiki` VALUES ('acronym','http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=$1','','',0,0),('advogato','http://www.advogato.org/$1','','',0,0),('annotationwiki','http://www.seedwiki.com/page.cfm?wikiid=368&doc=$1','','',0,0),('arxiv','http://www.arxiv.org/abs/$1','','',0,0),('c2find','http://c2.com/cgi/wiki?FindPage&value=$1','','',0,0),('cache','http://www.google.com/search?q=cache:$1','','',0,0),('commons','http://commons.wikimedia.org/wiki/$1','','',0,0),('corpknowpedia','http://corpknowpedia.org/wiki/index.php/$1','','',0,0),('dictionary','http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=$1','','',0,0),('disinfopedia','http://www.disinfopedia.org/wiki.phtml?title=$1','','',0,0),('docbook','http://wiki.docbook.org/topic/$1','','',0,0),('doi','http://dx.doi.org/$1','','',0,0),('drumcorpswiki','http://www.drumcorpswiki.com/index.php/$1','','',0,0),('dwjwiki','http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1','','',0,0),('elibre','http://enciclopedia.us.es/index.php/$1','','',0,0),('emacswiki','http://www.emacswiki.org/cgi-bin/wiki.pl?$1','','',0,0),('foldoc','http://foldoc.org/?$1','','',0,0),('foxwiki','http://fox.wikis.com/wc.dll?Wiki~$1','','',0,0),('freebsdman','http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=$1','','',0,0),('gej','http://www.esperanto.de/cgi-bin/aktivikio/wiki.pl?$1','','',0,0),('gentoo-wiki','http://gentoo-wiki.com/$1','','',0,0),('google','http://www.google.com/search?q=$1','','',0,0),('googlegroups','http://groups.google.com/groups?q=$1','','',0,0),('hammondwiki','http://www.dairiki.org/HammondWiki/$1','','',0,0),('hewikisource','http://he.wikisource.org/wiki/$1','','',1,0),('hrwiki','http://www.hrwiki.org/index.php/$1','','',0,0),('imdb','http://us.imdb.com/Title?$1','','',0,0),('jargonfile','http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=$1','','',0,0),('jspwiki','http://www.jspwiki.org/wiki/$1','','',0,0),('keiki','http://kei.ki/en/$1','','',0,0),('kmwiki','http://kmwiki.wikispaces.com/$1','','',0,0),('linuxwiki','http://linuxwiki.de/$1','','',0,0),('lojban','http://www.lojban.org/tiki/tiki-index.php?page=$1','','',0,0),('lqwiki','http://wiki.linuxquestions.org/wiki/$1','','',0,0),('lugkr','http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?$1','','',0,0),('mathsongswiki','http://SeedWiki.com/page.cfm?wikiid=237&doc=$1','','',0,0),('meatball','http://www.usemod.com/cgi-bin/mb.pl?$1','','',0,0),('mediawikiwiki','http://www.mediawiki.org/wiki/$1','','',0,0),('mediazilla','https://bugzilla.wikimedia.org/$1','','',1,0),('memoryalpha','http://www.memory-alpha.org/en/index.php/$1','','',0,0),('metawiki','http://sunir.org/apps/meta.pl?$1','','',0,0),('metawikimedia','http://meta.wikimedia.org/wiki/$1','','',0,0),('moinmoin','http://purl.net/wiki/moin/$1','','',0,0),('mozillawiki','http://wiki.mozilla.org/index.php/$1','','',0,0),('mw','http://www.mediawiki.org/wiki/$1','','',0,0),('oeis','http://www.research.att.com/cgi-bin/access.cgi/as/njas/sequences/eisA.cgi?Anum=$1','','',0,0),('openfacts','http://openfacts.berlios.de/index.phtml?title=$1','','',0,0),('openwiki','http://openwiki.com/?$1','','',0,0),('pmeg','http://www.bertilow.com/pmeg/$1.php','','',0,0),('ppr','http://c2.com/cgi/wiki?$1','','',0,0),('pythoninfo','http://wiki.python.org/moin/$1','','',0,0),('rfc','http://www.rfc-editor.org/rfc/rfc$1.txt','','',0,0),('s23wiki','http://is-root.de/wiki/index.php/$1','','',0,0),('seattlewiki','http://seattle.wikia.com/wiki/$1','','',0,0),('seattlewireless','http://seattlewireless.net/?$1','','',0,0),('senseislibrary','http://senseis.xmp.net/?$1','','',0,0),('sourceforge','http://sourceforge.net/$1','','',0,0),('squeak','http://wiki.squeak.org/squeak/$1','','',0,0),('susning','http://www.susning.nu/$1','','',0,0),('svgwiki','http://wiki.svg.org/$1','','',0,0),('tavi','http://tavi.sourceforge.net/$1','','',0,0),('tejo','http://www.tejo.org/vikio/$1','','',0,0),('theopedia','http://www.theopedia.com/$1','','',0,0),('tmbw','http://www.tmbw.net/wiki/$1','','',0,0),('tmnet','http://www.technomanifestos.net/?$1','','',0,0),('tmwiki','http://www.EasyTopicMaps.com/?page=$1','','',0,0),('twiki','http://twiki.org/cgi-bin/view/$1','','',0,0),('uea','http://www.tejo.org/uea/$1','','',0,0),('unreal','http://wiki.beyondunreal.com/wiki/$1','','',0,0),('usemod','http://www.usemod.com/cgi-bin/wiki.pl?$1','','',0,0),('vinismo','http://vinismo.com/en/$1','','',0,0),('webseitzwiki','http://webseitz.fluxent.com/wiki/$1','','',0,0),('why','http://clublet.com/c/c/why?$1','','',0,0),('wiki','http://c2.com/cgi/wiki?$1','','',0,0),('wikia','http://www.wikia.com/wiki/$1','','',0,0),('wikibooks','http://en.wikibooks.org/wiki/$1','','',1,0),('wikicities','http://www.wikia.com/wiki/$1','','',0,0),('wikif1','http://www.wikif1.org/$1','','',0,0),('wikihow','http://www.wikihow.com/$1','','',0,0),('wikimedia','http://wikimediafoundation.org/wiki/$1','','',0,0),('wikinews','http://en.wikinews.org/wiki/$1','','',1,0),('wikinfo','http://www.wikinfo.org/index.php/$1','','',0,0),('wikipedia','http://en.wikipedia.org/wiki/$1','','',1,0),('wikiquote','http://en.wikiquote.org/wiki/$1','','',1,0),('wikisource','http://wikisource.org/wiki/$1','','',1,0),('wikispecies','http://species.wikimedia.org/wiki/$1','','',1,0),('wikitravel','http://wikitravel.org/en/$1','','',0,0),('wikiversity','http://en.wikiversity.org/wiki/$1','','',1,0),('wikt','http://en.wiktionary.org/wiki/$1','','',1,0),('wiktionary','http://en.wiktionary.org/wiki/$1','','',1,0),('wlug','http://www.wlug.org.nz/$1','','',0,0),('zwiki','http://zwiki.org/$1','','',0,0),('zzz wiki','http://wiki.zzz.ee/index.php/$1','','',0,0); /*!40000 ALTER TABLE `mw_interwiki` ENABLE KEYS */; UNLOCK TABLES; diff --git a/tests/selenium/data/mediawiki118_fresh_installation.sql b/tests/selenium/data/mediawiki118_fresh_installation.sql index 2724bad5..7beb9e6a 100644 --- a/tests/selenium/data/mediawiki118_fresh_installation.sql +++ b/tests/selenium/data/mediawiki118_fresh_installation.sql @@ -391,7 +391,7 @@ INSERT INTO `mw_interwiki` VALUES ('mediawikiwiki','http://www.mediawiki.org/wik INSERT INTO `mw_interwiki` VALUES ('mediazilla','https://bugzilla.wikimedia.org/$1','','',1,0); INSERT INTO `mw_interwiki` VALUES ('memoryalpha','http://www.memory-alpha.org/en/index.php/$1','','',0,0); INSERT INTO `mw_interwiki` VALUES ('metawiki','http://sunir.org/apps/meta.pl?$1','','',0,0); -INSERT INTO `mw_interwiki` VALUES ('metawikipedia','http://meta.wikimedia.org/wiki/$1','','',0,0); +INSERT INTO `mw_interwiki` VALUES ('metawikimedia','http://meta.wikimedia.org/wiki/$1','','',0,0); INSERT INTO `mw_interwiki` VALUES ('moinmoin','http://purl.net/wiki/moin/$1','','',0,0); INSERT INTO `mw_interwiki` VALUES ('mozillawiki','http://wiki.mozilla.org/index.php/$1','','',0,0); INSERT INTO `mw_interwiki` VALUES ('mw','http://www.mediawiki.org/wiki/$1','','',0,0); diff --git a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php index bf5b379d..8bca4b0d 100644 --- a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php +++ b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 30 (http://www.mediawiki.org/wiki/New_installer/Test_plan) @@ -99,4 +99,4 @@ class MediaWikiButtonsAvailabilityTestCase extends MediaWikiInstallationCommonFu $this->assertTrue( $this->isElementPresent( "submit-back" )); $this->assertTrue( $this->isElementPresent( "submit-continue" )); } -}
\ No newline at end of file +} diff --git a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php index f1b79459..8e2afe73 100644 --- a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php +++ b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php @@ -28,7 +28,7 @@ */ -require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); /** * Test Case ID : 04 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php index 2d623afc..55ad4612 100644 --- a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php +++ b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php @@ -27,7 +27,7 @@ * */ -require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); /** * Test Case ID : 02 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php index b112bc0e..825ca424 100644 --- a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php +++ b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php @@ -28,7 +28,7 @@ */ -require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); /** * Test Case ID : 09 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php index 024fe5d6..c2b35054 100644 --- a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php +++ b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php @@ -33,7 +33,7 @@ * Version : MediaWiki 1.18alpha */ -require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); class MediaWikiErrorsNamepageTestCase extends MediaWikiInstallationCommonFunction { diff --git a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php index 806fcfde..78205cf8 100644 --- a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php +++ b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php @@ -33,7 +33,7 @@ * Version : MediaWiki 1.18alpha */ -require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationCommonFunction.php' ); class MediaWikiHelpFieldHintTestCase extends MediaWikiInstallationCommonFunction { diff --git a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php index 99df8a2a..353fa2ee 100644 --- a/tests/selenium/installer/MediaWikiInstallationCommonFunction.php +++ b/tests/selenium/installer/MediaWikiInstallationCommonFunction.php @@ -27,9 +27,9 @@ */ require_once 'PHPUnit/Extensions/SeleniumTestCase.php'; -require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationConfig.php' ); -require_once ( dirname(__FILE__) . '/MediaWikiInstallationMessage.php' ); -require_once ( dirname(__FILE__) . '/MediaWikiInstallationVariables.php'); +require_once ( __DIR__ . '/MediaWikiInstallationConfig.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationMessage.php' ); +require_once ( __DIR__ . '/MediaWikiInstallationVariables.php'); class MediaWikiInstallationCommonFunction extends PHPUnit_Extensions_SeleniumTestCase { diff --git a/tests/selenium/installer/MediaWikiInstallerTestSuite.php b/tests/selenium/installer/MediaWikiInstallerTestSuite.php index 386a50ea..58ccc7cd 100644 --- a/tests/selenium/installer/MediaWikiInstallerTestSuite.php +++ b/tests/selenium/installer/MediaWikiInstallerTestSuite.php @@ -30,19 +30,19 @@ require_once 'PHPUnit/Framework.php'; require_once 'PHPUnit/Framework/TestSuite.php'; -require_once ( dirname( __FILE__ ) . '/MediaWikiUserInterfaceTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiButtonsAvailabilityTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiHelpFieldHintTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiRightFrameworkLinksTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiRestartInstallationTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiErrorsConnectToDatabasePageTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiErrorsNamepageTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiMySQLDataBaseTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiMySQLiteDataBaseTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiUpgradeExistingDatabaseTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiDifferntDatabasePrefixTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiDifferentDatabaseAccountTestCase.php' ); -require_once ( dirname( __FILE__ ) . '/MediaWikiOnAlreadyInstalledTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiUserInterfaceTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiButtonsAvailabilityTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiHelpFieldHintTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiRightFrameworkLinksTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiRestartInstallationTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiErrorsConnectToDatabasePageTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiErrorsNamepageTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiMySQLDataBaseTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiMySQLiteDataBaseTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiUpgradeExistingDatabaseTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiDifferntDatabasePrefixTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiDifferentDatabaseAccountTestCase.php' ); +require_once ( __DIR__ . '/MediaWikiOnAlreadyInstalledTestCase.php' ); diff --git a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php index 399ed4e5..16d065c7 100644 --- a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 01 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php index f57c1a55..4ca69162 100644 --- a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 06 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php index 4c052666..7a1b615c 100644 --- a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php +++ b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** diff --git a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php index b9ca8305..ea87de08 100644 --- a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php +++ b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php @@ -29,7 +29,7 @@ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 11, 12 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php index 700172c2..7b0fcf36 100644 --- a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php +++ b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 14, 15, 16, 17 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php index eb82071e..5cdc8d42 100644 --- a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php +++ b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php @@ -28,7 +28,7 @@ */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 05 (http://www.mediawiki.org/wiki/New_installer/Test_plan) @@ -114,4 +114,4 @@ class MediaWikiUpgradeExistingDatabaseTestCase extends MediaWikiInstallationComm $this->chooseCancelOnNextConfirmation(); parent::restartInstallation(); } -}
\ No newline at end of file +} diff --git a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php index 0994892f..15fad95f 100644 --- a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php +++ b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php @@ -27,7 +27,7 @@ * */ -require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); +require_once (__DIR__.'/'.'MediaWikiInstallationCommonFunction.php'); /** * Test Case ID : 18 - 27 (http://www.mediawiki.org/wiki/New_installer/Test_plan) diff --git a/tests/selenium/installer/README.txt b/tests/selenium/installer/README.txt index 83d1a346..bc880a8b 100644 --- a/tests/selenium/installer/README.txt +++ b/tests/selenium/installer/README.txt @@ -1,6 +1,6 @@ == Details== -Automated Selenium test scripts written for MediaWiki Installer is available at svn.wikimedia.org/svnroot/mediawiki/trunk/phase3/tests/selenium/installer. +Automated Selenium test scripts written for MediaWiki Installer is available at https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/core.git;a=tree;f=tests/selenium/installer;hb=HEAD. Detailed test cases available at http://www.mediawiki.org/wiki/New_installer/Test_plan. Version : MediaWiki 1.18alpha diff --git a/tests/selenium/suites/MediawikiCoreSmokeTestCase.php b/tests/selenium/suites/MediawikiCoreSmokeTestCase.php index 5fc1a5a6..6b8fc974 100644 --- a/tests/selenium/suites/MediawikiCoreSmokeTestCase.php +++ b/tests/selenium/suites/MediawikiCoreSmokeTestCase.php @@ -43,7 +43,7 @@ class MediawikiCoreSmokeTestCase extends SeleniumTestCase { $this->login(); $this->open( $this->getUrl() . '/index.php?title=Special:Upload' ); - $this->type( 'wpUploadFile', dirname( __FILE__ ) . + $this->type( 'wpUploadFile', __DIR__ . "\\..\\data\\Wikipedia-logo-v2-de.png" ); $this->check( 'wpIgnoreWarning' ); $this->click( 'wpUpload' ); diff --git a/tests/selenium/suites/MyContributionsTestCase.php b/tests/selenium/suites/MyContributionsTestCase.php index 01d87e4b..b8d2d48d 100644 --- a/tests/selenium/suites/MyContributionsTestCase.php +++ b/tests/selenium/suites/MyContributionsTestCase.php @@ -27,7 +27,7 @@ * */ -require_once dirname( dirname( __FILE__ ) ) . '/SeleniumTestConstants.php'; +require_once dirname( __DIR__ ) . '/SeleniumTestConstants.php'; class MyContributionsTestCase extends SeleniumTestCase { diff --git a/tests/selenium/suites/MyWatchListTestCase.php b/tests/selenium/suites/MyWatchListTestCase.php index d1ee3e78..998fab9d 100644 --- a/tests/selenium/suites/MyWatchListTestCase.php +++ b/tests/selenium/suites/MyWatchListTestCase.php @@ -27,7 +27,7 @@ * */ -require_once dirname( dirname( __FILE__ ) ) . '/SeleniumTestConstants.php'; +require_once dirname( __DIR__ ) . '/SeleniumTestConstants.php'; class MyWatchListTestCase extends SeleniumTestCase { |