Skip to content

Commit cd32e4a

Browse files
committed
Update login function
1 parent 83063a2 commit cd32e4a

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/JoomlaBrowser.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ public function doAdministratorLogin()
3535
{
3636
$I = $this;
3737
$I->amOnPage('/administrator/index.php');
38-
$I->fillField('username', $this->config['username']);
39-
$I->fillField('Password', $this->config['password']);
40-
$I->click('Log in');
38+
$I->fillField('#mod-login-username', $this->config['username']);
39+
$I->fillField('#mod-login-password', $this->config['password']);
40+
// @todo: update login button in joomla login screen to make this xPath more friendly
41+
$I->click("//form[@id='form-login']/fieldset/div[3]/div/div/button");
4142
$I->waitForText('Control Panel', 10, 'H1');
4243
}
4344

@@ -54,6 +55,7 @@ public function installJoomla()
5455
//$I->expect('no configuration.php is in the Joomla CMS folder');
5556
//$I->dontSeeFileFound('configuration.php', $this->config['Joomla folder')];
5657
$I->amOnPage('/installation/index.php');
58+
$this->debug('I open Joomla Installation Configuration Page and fill the fields');
5759

5860
// I Wait for the text Main Configuration, meaning that the page is loaded
5961
$I->waitForText('Main Configuration', 10, 'h3');
@@ -71,7 +73,8 @@ public function installJoomla()
7173
$I->fillField('Confirm Admin Password', $this->config['password']);
7274
$I->click("//fieldset[@id='jform_site_offline']/label[2]"); // ['No Site Offline']
7375
$I->click('Next');
74-
// I Fill the form for creating the Joomla site Database'
76+
77+
$this->debug('I Fill the form for creating the Joomla site Database');
7578
$I->waitForText('Database Configuration', 10, 'h3');
7679

7780
$I->selectOption('#jform_db_type', $this->config['database type']);
@@ -83,7 +86,7 @@ public function installJoomla()
8386
$I->click("//label[@for='jform_db_old1']"); // Remove Old Database button
8487
$I->click('Next');
8588

86-
// I Fill the form for creating the Joomla site database
89+
$this->debug('I install joomla with or without sample data');
8790
$I->waitForText('Finalisation', 10, 'h3');
8891

8992
if ($this->config['install sample data']) :
@@ -95,14 +98,15 @@ public function installJoomla()
9598

9699
// Wait while Joomla gets installed
97100
$I->waitForText('Congratulations! Joomla! is now installed.', 30, 'h3');
101+
$this->debug('Joomla is now installed');
98102
}
99103

100104
/**
101105
* Sets in Adminitrator->Global Configuration the Error reporting to Development
102106
*
103107
* @note: doAdminLogin() before
104108
*/
105-
public function setErrorReportingToDevelopment()
109+
public function setErrorReportingtoDevelopment()
106110
{
107111
$I = $this;
108112
$I->amOnPage('/administrator/index.php?option=com_config');

0 commit comments

Comments
 (0)