From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 3 May 2012 13:01:35 +0200 Subject: Update to MediaWiki 1.19.0 --- tests/selenium/SeleniumConfig.php | 16 ++++----- tests/selenium/data/SimpleSeleniumTestDB.sql | 1 - .../data/mediawiki118_fresh_installation.sql | 15 ++++---- .../MediaWikiButtonsAvailabilityTestCase.php | 2 +- .../MediaWikiDifferentDatabaseAccountTestCase.php | 2 +- .../MediaWikiDifferntDatabasePrefixTestCase.php | 2 +- ...ediaWikiErrorsConnectToDatabasePageTestCase.php | 2 +- .../installer/MediaWikiErrorsNamepageTestCase.php | 2 +- .../installer/MediaWikiHelpFieldHintTestCase.php | 2 +- .../installer/MediaWikiInstallationConfig.php | 4 +-- .../installer/MediaWikiMySQLDataBaseTestCase.php | 2 +- .../MediaWikiMySQLiteDataBaseTestCase.php | 2 +- .../MediaWikiOnAlreadyInstalledTestCase.php | 2 +- .../MediaWikiRestartInstallationTestCase.php | 2 +- .../MediaWikiRightFrameworkLinksTestCase.php | 2 +- .../MediaWikiUpgradeExistingDatabaseTestCase.php | 2 +- .../installer/MediaWikiUserInterfaceTestCase.php | 2 +- .../selenium/suites/MediawikiCoreSmokeTestCase.php | 40 +++++++++++----------- .../suites/MediawikiCoreSmokeTestSuite.php | 2 +- tests/selenium/suites/SimpleSeleniumTestCase.php | 14 ++++---- tests/selenium/suites/SimpleSeleniumTestSuite.php | 2 +- 21 files changed, 59 insertions(+), 61 deletions(-) (limited to 'tests/selenium') diff --git a/tests/selenium/SeleniumConfig.php b/tests/selenium/SeleniumConfig.php index b8cdf1c5..b1487154 100644 --- a/tests/selenium/SeleniumConfig.php +++ b/tests/selenium/SeleniumConfig.php @@ -5,7 +5,7 @@ if ( !defined( 'SELENIUMTEST' ) ) { class SeleniumConfig { - /* + /** * Retreives the Selenium configuration values from an ini file. * See sample config file in selenium_settings.ini.sample * @@ -72,14 +72,14 @@ class SeleniumConfig { 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(); @@ -95,19 +95,19 @@ class SeleniumConfig { list( $key, $value ) = explode( '=', $iniLine, 2 ); $key = trim( $key ); $value = trim( $value ); - + if ( isset( $specialValues[$value] ) ) { $value = $specialValues[$value]; } else { $value = trim( $value, '"' ); } - + /* Support one-level arrays */ if ( preg_match( '/^([A-Za-z]+)\[([A-Za-z]+)\]/', $key, $m ) ) { $key = $m[1]; $value = array( $m[2] => $value ); } - + return array( $key => $value ); } } diff --git a/tests/selenium/data/SimpleSeleniumTestDB.sql b/tests/selenium/data/SimpleSeleniumTestDB.sql index 7944c45f..1a3196c3 100644 --- a/tests/selenium/data/SimpleSeleniumTestDB.sql +++ b/tests/selenium/data/SimpleSeleniumTestDB.sql @@ -1295,7 +1295,6 @@ CREATE TABLE `mw_user` ( `user_newpassword` tinyblob NOT NULL, `user_newpass_time` binary(14) DEFAULT NULL, `user_email` tinytext NOT NULL, - `user_options` blob NOT NULL, `user_touched` binary(14) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0', `user_token` binary(32) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', `user_email_authenticated` binary(14) DEFAULT NULL, diff --git a/tests/selenium/data/mediawiki118_fresh_installation.sql b/tests/selenium/data/mediawiki118_fresh_installation.sql index 89bc3191..2724bad5 100644 --- a/tests/selenium/data/mediawiki118_fresh_installation.sql +++ b/tests/selenium/data/mediawiki118_fresh_installation.sql @@ -767,13 +767,13 @@ CREATE TABLE `mw_objectcache` ( LOCK TABLES `mw_objectcache` WRITE; /*!40000 ALTER TABLE `mw_objectcache` DISABLE KEYS */; -INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:messages:en','K2.2R\ns\r\nSδ2\0','2010-12-31 13:16:31'); -INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:pcache:idhash:1-0!*!*!!en!*','V[oFg~BPm)$TKU\08$9a\rIlX>ܹqSa,ʕ x?[~ʃ|.Z$8Y\'IYK-\04UJ\'&uB):IEmsk``kQva\rZt0+P%GEـJX;\n-sP@Bb8~첒$eaυf+0[,Fxd\'z0BJ=Jc\\:&BT\'CFdÿ׆FqGd%8G0AI; Ԙ`75LI\r({cg+8Qr&ͦA)VЕPT\\UƧtnZeSfJZ(VP}0ON =j\\H y\\U[h]T: bdu+j%\'6kf:E;@Yך4Ȁq Zº65{ dw>=J)\r6t XMB\nŖTb>qg 7 zn7vwr-%u-QiiX1NeA#vӧ3?','2010-12-31 13:16:31'); -INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:pcache:idoptions:1','E@ D` \"vƣWh,b!⭙7L+|}t I$<F\rpSl4OJN`\r\Z ծ)PY$Kգ9Vjp72EcWp2cVxu7 p#r=.[>y)Zp','2010-12-31 13:16:31'); -INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-css:3832ee25d9c44988461f5f339b9b6a48','+26RrMMLTHɩV\0Z((3(Rd\r\0','2038-01-19 03:14:07'); -INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-css:aa0df16258ad99a1d249e796b5067ed9','+2RrMMLTHɩNK-Q.,LNJ,R\0s򋬔\rV\Z\0','2038-01-19 03:14:07'); -INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-js:22814eeadc9cf0a9ebcd844e14198e66','mr0 y r&Qޡמ!\nqQXq;}$ވ c!]]].o5S\n)Fq L^?sF!OM\\\0NɁլ:-jF{ۅG\"i \Z6K!Y]=F[~竍䶃`9NǴ@K|z1A@J#_ԁ7\'l1) J͵).3 zfTAHњ[#)BzRA7֌\"T*~SW/PBŎ;\Zay6+U?.$6-uTv@hs&NإbfJ~]6p/q)>E1͔A\neLg\ZE`cW`fJEa>b\nӑd.udo[\ntb+l\Z?X*Y(օ;LJqťɝd$\"WzG-@b~+#kǞَƂ~P)B qҖ2rRl`z 4ÝXm;X݁t;r.sARy)kA\nRJTJU*W_ߟ4@vtf>x','2038-01-19 03:14:07'); -INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-js:dd9440c19c575629ac5ec90e489cf62e','+21RԔLĔ\"ĒTj̒T%+ĔJZMk.%k\0','2038-01-19 03:14:07'); +INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:messages:en','K�2��.�2�R\ns\r\n���S�δ2��\0','2010-12-31 13:16:31'); +INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:pcache:idhash:1-0!*!*!!en!*','�V[o�F�g~�����B��P��m)$TK�U��\0�����8$��9�a\rI�l��X>��ܹ�q�Sa,��ʕ� x��?[~ʃ|�.Z��$�8Y�\'�I�Y�K��-\04�U����J�\'&�uB)�:I������E�m�sk`�`k�Q�v��a���\rZ��t�0����+P%GE�ـ�JX;\n-s�P�@�B�b���8~�첒$��ea�υ��f��+���0[,�F�x��d�\'�z�0��BJ���=���J��c�\\��:��&B��T��\'��C��Fdÿ׆Fq����Gd����%8G�0��A�I��; Ԙ`�7�5�LI\r��(���{�c�����g+��8Qr�&�ͦ��A)�V��ЕPT��\\UƧtn��Z�e�SfJZ(V�P�}����0��O�N �=j�\\H� �y�\\�U[h]T:� ��bd��u��+�j%\'�6k��f:E�;�@Yך��4���Ȁ��q� ��Z�º65{� ���dw�>�=J)\r�6t ��X����M���B�\n�ŖT����b>�qg���� 7� �z�n7��vwr�-%u�-Qi�iX1��Ne���A#�v��ӧ�3��?','2010-12-31 13:16:31'); +INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:pcache:idoptions:1','E���@ D��`� \"v�ƣ��Wh��,�b�!�⭙7�L+�|}�t ��I�$�<���F\rpSl�4����OJN`\r\Z��� � ծ���)��PY��$�K����գ9�Vjp72��E���c�Wp�2��cVxu7�� ����p#�r=.���[>y)Zp��','2010-12-31 13:16:31'); +INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-css:3832ee25d9c44988461f5f339b9b6a48','+�26�Rr�MM�LTH�ɩV\0�Z(��(3�(R�d\r\0','2038-01-19 03:14:07'); +INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-css:aa0df16258ad99a1d249e796b5067ed9','+�2��Rr�MM�LTH�ɩN��K-�Q.,�L�NJ,R\0��s򋬔�\r���V�\Z\0','2038-01-19 03:14:07'); +INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-js:22814eeadc9cf0a9ebcd844e14198e66','m��r�0 ��y ����r�&Qޡמ!\n�qQ�Xq;}���$��ވ� �c!]]].o5S�\n�)Fq ��L^��?�s�F�!�O�M\\�������\0���N��Ɂ���լ����:��-�j��F��{ۅ�G�\"i�� \Z�6�K����!��Y]=�F[�~竍���䶃����`��9N�Ǵ���@�K��|z�?1�A��@J#_ԁ�7\'�l�1) J�͵�).�3 z�f�T�A���Hњ�[#)�BzRA�7֌��\"T�*~SW���/P���B�Ŏ;\Z�ay�6����+U��?.$�6��-uT�v@h��s�&�����Nإb�fJ�~�]6��p��/q)�>�E�1��͔A\ne�L�g\ZE�`cW�����`fJ�E�a��>��b\n�ӑd�.u�do��[�\nt��b�+���l\Z?X*��Y�(�օ;�L�Jqťɝ���d$�\"�WzG�-@b~+�#�kǞَ�Ƃ~������P)B ����q�Җ2���r�Rl����`z �4�����ÝX�m�;�X݁t;r.�sA��R��y)�kA�\nR�JT��J�U��*�W��_ߟ�4@�vt��f���>����x���','2038-01-19 03:14:07'); +INSERT INTO `mw_objectcache` VALUES ('test_wiki-mw_:resourceloader:filter:minify-js:dd9440c19c575629ac5ec90e489cf62e','+�21�R���Ԕ�����L���Ĕ�\"��ĒT�j��̒T%+���ĔJ�ZMk.%k\0','2038-01-19 03:14:07'); /*!40000 ALTER TABLE `mw_objectcache` ENABLE KEYS */; UNLOCK TABLES; @@ -1384,7 +1384,6 @@ CREATE TABLE `mw_user` ( `user_newpassword` tinyblob NOT NULL, `user_newpass_time` binary(14) DEFAULT NULL, `user_email` tinytext NOT NULL, - `user_options` blob NOT NULL, `user_touched` binary(14) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0', `user_token` binary(32) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0', `user_email_authenticated` binary(14) DEFAULT NULL, diff --git a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php index 3557f516..bf5b379d 100644 --- a/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php +++ b/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php @@ -30,7 +30,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 30 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name :'Back' and 'Continue' button availability * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php index 4afcdc0e..f1b79459 100644 --- a/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php +++ b/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php @@ -30,7 +30,7 @@ require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); -/* +/** * Test Case ID : 04 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Install MediaWiki with different Database accounts for web access. * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php index b6a0fc09..2d623afc 100644 --- a/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php +++ b/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php @@ -29,7 +29,7 @@ require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); -/* +/** * Test Case ID : 02 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Install MediaWiki with the same database and the different * database prefixes(Share one database between multiple wikis). diff --git a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php index 3642a8ef..b112bc0e 100644 --- a/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php +++ b/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php @@ -30,7 +30,7 @@ require_once ( dirname( __FILE__ ) . '/MediaWikiInstallationCommonFunction.php' ); -/* +/** * Test Case ID : 09 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Invalid/ blank values for fields in 'Connect to database' page. * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php index d70dcc42..024fe5d6 100644 --- a/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php +++ b/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php @@ -27,7 +27,7 @@ * */ -/* +/** * Test Case ID : 10 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Invalid/ blank values for fields in 'Name' page. * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php index 355a2857..806fcfde 100644 --- a/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php +++ b/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php @@ -27,7 +27,7 @@ * */ -/* +/** * Test Case ID : 29 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Help field hint availability for the fields. * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiInstallationConfig.php b/tests/selenium/installer/MediaWikiInstallationConfig.php index d3067d69..d86bcb85 100644 --- a/tests/selenium/installer/MediaWikiInstallationConfig.php +++ b/tests/selenium/installer/MediaWikiInstallationConfig.php @@ -28,7 +28,7 @@ */ -/* +/** * MediaWikiInstallerTestSuite.php can be run one time successfully * with current value of the 'DB_NAME_PREFIX'. * If you wish to run the suite more than one time, you need to change @@ -39,7 +39,7 @@ define('DIRECTORY_NAME', "mediawiki" ); define( 'PORT', "8080" ); define( 'HOST_NAME', "localhost" ); -/* +/** * Use the followings to run the test suite in different browsers. * Firefox : *firefox * IE : *iexplore diff --git a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php index abf9ddf2..399ed4e5 100644 --- a/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php @@ -30,7 +30,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 01 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Install Mediawiki using 'MySQL' database type successfully * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php index fe704a42..f57c1a55 100644 --- a/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php +++ b/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php @@ -30,7 +30,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 06 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Install Mediawiki using 'MySQL' database type successfully * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php index e8b8f9b0..4c052666 100644 --- a/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php +++ b/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php @@ -31,7 +31,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 03 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Install mediawiki on a already installed Mediawiki.] * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php index b0a38000..b9ca8305 100644 --- a/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php +++ b/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php @@ -31,7 +31,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 11, 12 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Install mediawiki on a already installed Mediawiki. * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php index 346f24f8..700172c2 100644 --- a/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php +++ b/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php @@ -30,7 +30,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 14, 15, 16, 17 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : User selects 'Read me' link. * User selects 'Release notes' link. diff --git a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php index 0ab5e659..eb82071e 100644 --- a/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php +++ b/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php @@ -30,7 +30,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 05 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : Install Mediawiki by updating the existing database. * Version : MediaWiki 1.18alpha diff --git a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php index 7be39c04..0994892f 100644 --- a/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php +++ b/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php @@ -29,7 +29,7 @@ require_once (dirname(__FILE__).'/'.'MediaWikiInstallationCommonFunction.php'); -/* +/** * Test Case ID : 18 - 27 (http://www.mediawiki.org/wiki/New_installer/Test_plan) * Test Case Name : UI of MediaWiki initial/ Language/ Welcome to MediaWiki!/ Connect to database/ * Database settings/ Name/ Options/ Install/ Complete/ Restart Inslation pages diff --git a/tests/selenium/suites/MediawikiCoreSmokeTestCase.php b/tests/selenium/suites/MediawikiCoreSmokeTestCase.php index 7b9525af..5fc1a5a6 100644 --- a/tests/selenium/suites/MediawikiCoreSmokeTestCase.php +++ b/tests/selenium/suites/MediawikiCoreSmokeTestCase.php @@ -1,44 +1,44 @@ login(); $this->open( $this->getUrl() . @@ -48,10 +48,10 @@ class MediawikiCoreSmokeTestCase extends SeleniumTestCase { $this->check( 'wpIgnoreWarning' ); $this->click( 'wpUpload' ); $this->waitForPageToLoad( 30000 ); - + $this->assertSeleniumHTMLContains( '//h1[@class="firstHeading"]', "Wikipedia-logo-v2-de.png" ); - + /* $this->open( $this->getUrl() . '/index.php?title=Image:' . ucfirst( $this->filename ) . '&action=delete' ); @@ -64,6 +64,6 @@ class MediawikiCoreSmokeTestCase extends SeleniumTestCase { ucfirst( $this->filename ) . '.*has been deleted.' ); */ } - + } diff --git a/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php b/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php index 5d5ef518..a9a9b4d6 100644 --- a/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php +++ b/tests/selenium/suites/MediawikiCoreSmokeTestSuite.php @@ -1,5 +1,5 @@ open( $this->getUrl() . + $this->open( $this->getUrl() . '/index.php?title=Selenium&action=edit' ); $this->type( "wpTextbox1", "This is a basic test" ); $this->click( "wpPreview" ); @@ -16,8 +16,8 @@ class SimpleSeleniumTestCase extends SeleniumTestCase { $correct = strstr( $source, "This is a basic test" ); $this->assertEquals( $correct, true ); } - - /* + + /** * All this test really does is verify that a global var was set. * It depends on $wgDefaultSkin = 'chick'; being set */ @@ -26,9 +26,9 @@ class SimpleSeleniumTestCase extends SeleniumTestCase { $bodyClass = $this->getAttribute( "//body/@class" ); $this-> assertContains('skin-chick', $bodyClass, 'Chick skin not set'); } - - /* - * Just verify that the test db was loaded correctly + + /** + * Just verify that the test db was loaded correctly */ public function testDatabaseResourceLoadedCorrectly() { $this->open( $this->getUrl() . '/index.php/TestResources?action=purge' ); diff --git a/tests/selenium/suites/SimpleSeleniumTestSuite.php b/tests/selenium/suites/SimpleSeleniumTestSuite.php index 3f5e3645..2e0c4ee2 100644 --- a/tests/selenium/suites/SimpleSeleniumTestSuite.php +++ b/tests/selenium/suites/SimpleSeleniumTestSuite.php @@ -1,5 +1,5 @@