From cff1409eae37a0848e4ce317cb692210f392c1de Mon Sep 17 00:00:00 2001 From: Jelle Kok Date: Thu, 24 Aug 2017 23:20:20 +0200 Subject: [PATCH 1/5] Fix J3.8.0 language change on English --- src/JoomlaBrowser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php index d51b02e..fe94178 100644 --- a/src/JoomlaBrowser.php +++ b/src/JoomlaBrowser.php @@ -217,10 +217,10 @@ public function installJoomla() $this->waitForText('Configuración principal', TIMEOUT, 'h3'); // Wait for chosen to render the field - $this->debug('I select en-GB as installation language'); + $this->debug('I select en-US as installation language'); $this->debug('Wait for chosen to render the Languages list field'); $this->wait(2); - $this->selectOptionInChosenWithTextField('#jform_language', 'English (United Kingdom)'); + $this->selectOptionInChosenWithTextField('#jform_language', 'English (United States)'); $this->waitForText('Main Configuration', TIMEOUT, 'h3'); $this->debug('I fill Site Name'); $this->fillField(['id' => 'jform_site_name'], 'Joomla CMS test'); From f8ea244d4d9104621a6bd814dde5829160c27a57 Mon Sep 17 00:00:00 2001 From: Jelle Kok Date: Thu, 24 Aug 2017 23:55:35 +0200 Subject: [PATCH 2/5] fix language change --- src/JoomlaBrowser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php index fe94178..4de5d36 100644 --- a/src/JoomlaBrowser.php +++ b/src/JoomlaBrowser.php @@ -202,7 +202,7 @@ public function installJoomla() $this->debug('I open Joomla Installation Configuration Page'); $this->amOnPage('/installation/index.php'); $this->debug('I check that FTP tab is not present in installation. Otherwise it means that I have not enough ' - . 'permissions to install joomla and execution will be stopped'); + . 'permissions to install joomla and execution will be stopped'); $this->dontSeeElement(['id' => 'ftp']); // I Wait for the text Main Configuration, meaning that the page is loaded @@ -264,10 +264,10 @@ public function installJoomla() $this->click(['link' => 'Next']); $this->debug('I wait Joomla to remove the old database if exist'); $this->wait(1); - $this->waitForElementVisible(['id' => 'jform_sample_file-lbl'], 30); + $this->waitForElementVisible(['id' => 'jform_sample_file-lbl'], TIMEOUT); $this->debug('I install joomla with or without sample data'); - $this->waitForText('Finalisation', TIMEOUT, ['xpath' => '//h3']); + $this->waitForText('Finalization', TIMEOUT, ['css' => 'h3']); // @todo: installation of sample data needs to be created From e7ecd0e5347872587aca00ee4416f17cdda80a47 Mon Sep 17 00:00:00 2001 From: Jelle Kok Date: Fri, 25 Aug 2017 17:59:52 +0200 Subject: [PATCH 3/5] Update --- src/JoomlaBrowser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php index 4de5d36..a9f7317 100644 --- a/src/JoomlaBrowser.php +++ b/src/JoomlaBrowser.php @@ -220,7 +220,7 @@ public function installJoomla() $this->debug('I select en-US as installation language'); $this->debug('Wait for chosen to render the Languages list field'); $this->wait(2); - $this->selectOptionInChosenWithTextField('#jform_language', 'English (United States)'); + $this->selectOptionInChosenWithTextField('#jform_language', 'English (United Kingdom)'); $this->waitForText('Main Configuration', TIMEOUT, 'h3'); $this->debug('I fill Site Name'); $this->fillField(['id' => 'jform_site_name'], 'Joomla CMS test'); @@ -267,7 +267,7 @@ public function installJoomla() $this->waitForElementVisible(['id' => 'jform_sample_file-lbl'], TIMEOUT); $this->debug('I install joomla with or without sample data'); - $this->waitForText('Finalization', TIMEOUT, ['css' => 'h3']); + $this->waitForText('Finalisation', TIMEOUT, ['css' => 'h3']); // @todo: installation of sample data needs to be created @@ -291,7 +291,7 @@ public function installJoomlaRemovingInstallationFolder() $this->installJoomla(); $this->debug('Removing Installation Folder'); - $this->click(['xpath' => "//input[@value='Remove installation folder']"]); + $this->click(['xpath' => "//input[@value='Remove \"installation\" folder']"]); $this->debug('I wait for Removing Installation Folder button to become disabled'); $this->waitForJS("return jQuery('form#adminForm input[name=instDefault]').attr('disabled') == 'disabled';", TIMEOUT); From a22e17bb5040799808a5d625eb0e4a924df7fc9a Mon Sep 17 00:00:00 2001 From: Jelle Kok Date: Fri, 25 Aug 2017 18:02:42 +0200 Subject: [PATCH 4/5] update again --- src/JoomlaBrowser.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php index a9f7317..9500248 100644 --- a/src/JoomlaBrowser.php +++ b/src/JoomlaBrowser.php @@ -202,7 +202,7 @@ public function installJoomla() $this->debug('I open Joomla Installation Configuration Page'); $this->amOnPage('/installation/index.php'); $this->debug('I check that FTP tab is not present in installation. Otherwise it means that I have not enough ' - . 'permissions to install joomla and execution will be stopped'); + . 'permissions to install joomla and execution will be stopped'); $this->dontSeeElement(['id' => 'ftp']); // I Wait for the text Main Configuration, meaning that the page is loaded @@ -217,7 +217,7 @@ public function installJoomla() $this->waitForText('Configuración principal', TIMEOUT, 'h3'); // Wait for chosen to render the field - $this->debug('I select en-US as installation language'); + $this->debug('I select en-UK as installation language'); $this->debug('Wait for chosen to render the Languages list field'); $this->wait(2); $this->selectOptionInChosenWithTextField('#jform_language', 'English (United Kingdom)'); @@ -264,10 +264,10 @@ public function installJoomla() $this->click(['link' => 'Next']); $this->debug('I wait Joomla to remove the old database if exist'); $this->wait(1); - $this->waitForElementVisible(['id' => 'jform_sample_file-lbl'], TIMEOUT); + $this->waitForElementVisible(['id' => 'jform_sample_file-lbl'], 30); $this->debug('I install joomla with or without sample data'); - $this->waitForText('Finalisation', TIMEOUT, ['css' => 'h3']); + $this->waitForText('Finalisation', TIMEOUT, ['xpath' => '//h3']); // @todo: installation of sample data needs to be created From 918311b65e391fa1bf1f5a6ab88f17c838bcf67c Mon Sep 17 00:00:00 2001 From: Jelle Kok Date: Fri, 25 Aug 2017 18:03:30 +0200 Subject: [PATCH 5/5] GB --- src/JoomlaBrowser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php index 9500248..d390136 100644 --- a/src/JoomlaBrowser.php +++ b/src/JoomlaBrowser.php @@ -217,7 +217,7 @@ public function installJoomla() $this->waitForText('Configuración principal', TIMEOUT, 'h3'); // Wait for chosen to render the field - $this->debug('I select en-UK as installation language'); + $this->debug('I select en-GB as installation language'); $this->debug('Wait for chosen to render the Languages list field'); $this->wait(2); $this->selectOptionInChosenWithTextField('#jform_language', 'English (United Kingdom)');