r79512 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79511‎ | r79512 | r79513 >
Date:09:18, 3 January 2011
Author:nadeesha
Status:ok
Tags:
Comment:
Change the xpath of the 'You can now Folder/index.php start using your wiki' text.
Modified paths:
  • /trunk/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php
@@ -38,80 +38,80 @@
3939
4040
4141 class MediaWikiUpgradeExistingDatabaseTestCase extends MediaWikiInstallationCommonFunction {
42 -
 42+
4343 function setUp() {
4444 parent::setUp();
4545 }
46 -
 46+
4747 // Install Mediawiki using 'MySQL' database type.
4848 public function testUpgradeExistingDatabase() {
49 -
 49+
5050 $databaseName = DB_NAME_PREFIX."_upgrade_existing";
5151 parent::navigateInstallPage( $databaseName );
52 -
 52+
5353 $this->open( "http://localhost:".PORT."/".DIRECTORY_NAME."/config/index.php" );
5454 $this->assertEquals( "Install", $this->getText( LINK_DIV."h2" ));
5555 $this->assertEquals( "Warning: You seem to have already installed MediaWiki and are trying to install it again. Please proceed to the next page.",
5656 $this->getText( LINK_DIV."div[2]/form/div[1]/div[2]" ));
57 -
 57+
5858 // 'Optionis' page
5959 parent::clickBackButton();
60 -
 60+
6161 // 'Name' page
6262 parent::clickBackButton();
63 -
 63+
6464 // 'Database settings' page
6565 parent::clickBackButton();
66 -
 66+
6767 // 'Connect to database' page
6868 parent::clickBackButton();
6969 $this->type( "mysql_wgDBname", $databaseName );
7070 parent::clickContinueButton();
71 -
 71+
7272 // 'Upgrade existing installation' page displayed next to the 'Connect to database' page.
7373 $this->assertEquals( "Upgrade existing installation", $this->getText( LINK_DIV."h2" ));
74 -
 74+
7575 // Warning message displayed.
7676 $this->assertEquals( "There are MediaWiki tables in this database. To upgrade them to MediaWiki 1.18alpha, click Continue.",
7777 $this->getText( LINK_DIV."div[2]/form/div[1]/div[2]" ));
78 -
 78+
7979 parent::clickContinueButton();
8080 $this->assertEquals( "Upgrade existing installation",
8181 $this->getText( LINK_DIV."h2" ));
82 -
 82+
8383 // 'Upgrade complete.' text display
8484 $this->assertEquals("Upgrade complete.",
85 - $this->getText( "[@id='bodyContent']/div/div[1]/div[4]/form/div[1]/div[2]/p[1]" ));
86 -
 85+ $this->getText("//div[@id='bodyContent']/div/div[1]/div[4]/form/div[1]/div[2]/p[1]"));
 86+
8787 $this->assertEquals("You can now Folder/index.php start using your wiki.",
88 - $this->getText( "[@id='bodyContent']/div/div[1]/div[4]/form/div[1]/div[2]/p[2]" ));
89 -
90 - $this->assertEquals( "Folder/index.php start using your wiki",
91 - $this->getText( "link=Folder/index.php start using your wiki" ));
92 -
 88+ $this->getText("//div[@id='bodyContent']/div/div[1]/div[4]/form/div[1]/div[2]/p[2]" ));
 89+
 90+ $this->assertEquals( "Folder/index.php start using your wiki",
 91+ $this->getText( "link=Folder/index.php start using your wiki" ));
 92+
9393 $this->assertTrue($this->isElementPresent( "submit-regenerate" ));
9494 $this->click( "submit-regenerate" );
9595 $this->waitForPageToLoad( PAGE_LOAD_TIME );
9696 $this->assertEquals( "Database settings",
9797 $this->getText( LINK_DIV."h2" ));
98 -
 98+
9999 // 'Database settings' page
100100 parent::clickContinueButton();
101 -
 101+
102102 // Name page
103103 parent::completeNamePage();
104 -
 104+
105105 // Options page
106106 parent::clickContinueButton();
107 -
 107+
108108 // Install page
109109 $this->assertEquals( "Warning: You seem to have already installed MediaWiki and are trying to install it again. Please proceed to the next page.",
110110 $this->getText( LINK_FORM."div[1]/div[2]" ));
111111 parent::clickContinueButton();
112 -
 112+
113113 // complete
114114 parent::completePageSuccessfull();
115115 $this->chooseCancelOnNextConfirmation();
116116 parent::restartInstallation();
117117 }
118 -}
 118+}
\ No newline at end of file

Status & tagging log