Skip to content

Commit 1254075

Browse files
committed
Merge branch 'release/v1.1.3'
2 parents 435a583 + 4354c1f commit 1254075

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

src/JoomlaBrowser.php

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,16 @@ class JoomlaBrowser extends WebDriver
3434
public function doAdministratorLogin()
3535
{
3636
$I = $this;
37+
$this->debug('I open Joomla Administrator Login Page');
3738
$I->amOnPage('/administrator/index.php');
39+
$this->debug('Fill Username Text Field');
3840
$I->fillField('#mod-login-username', $this->config['username']);
41+
$this->debug('Fill Password Text Field');
3942
$I->fillField('#mod-login-password', $this->config['password']);
4043
// @todo: update login button in joomla login screen to make this xPath more friendly
44+
$this->debug('I click Login button');
4145
$I->click("//form[@id='form-login']/fieldset/div[3]/div/div/button");
46+
$this->debug('I wait to see Administrator Control Panel');
4247
$I->waitForText('Control Panel', 10, 'H1');
4348
}
4449

@@ -107,13 +112,15 @@ public function installJoomla()
107112

108113
$this->debug('I install joomla with or without sample data');
109114
$I->waitForText('Finalisation', 10, 'h3');
110-
111-
$this->debug('I install Sample Data');
112-
if ($this->config['install sample data']) :
113-
$I->selectOption('#jform_sample_file', $this->config['sample data']);
114-
else :
115-
$I->selectOption('#jform_sample_file', '#jform_sample_file0'); // No sample data
116-
endif;
115+
// @todo: installation of sample data needs to be created
116+
//if ($this->config['install sample data']) :
117+
// $this->debug('I install Sample Data:' . $this->config['sample data']);
118+
// $I->selectOption('#jform_sample_file', $this->config['sample data']);
119+
//else :
120+
// $this->debug('I install Joomla without Sample Data');
121+
// $I->selectOption('#jform_sample_file', '#jform_sample_file0'); // No sample data
122+
//endif;
123+
$I->selectOption('#jform_sample_file', '#jform_sample_file0'); // No sample data
117124
$I->click('Install');
118125

119126
// Wait while Joomla gets installed

0 commit comments

Comments
 (0)