From 25b4455805916a6eed8e6fa9c1575e428050e8ec Mon Sep 17 00:00:00 2001 From: Hans Erik Jepsen Date: Wed, 5 Jul 2017 13:40:33 +0200 Subject: [PATCH 1/2] Fixed status message checks for Joomla 3.7.3 --- src/JoomlaBrowser.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php index 7b7c351..0545c7d 100644 --- a/src/JoomlaBrowser.php +++ b/src/JoomlaBrowser.php @@ -588,7 +588,7 @@ public function enablePlugin($pluginName) $I->checkExistenceOf($pluginName); $I->click(['xpath' => "//input[@id='cb0']"]); $I->click(['xpath' => "//div[@id='toolbar-publish']/button"]); - $I->see('successfully enabled', ['id' => 'system-message-container']); + $I->see(' enabled', ['id' => 'system-message-container']); } /** @@ -748,7 +748,7 @@ public function setModulePosition($module, $position = 'position-7') $I->waitForElement(['id' => 'general'], 30); $I->selectOptionInChosen('Position', $position); $I->click(['xpath' => "//div[@id='toolbar-apply']/button"]); - $I->waitForText('Module successfully saved', 30, ['id' => 'system-message-container']); + $I->waitForText('Module saved', 30, ['id' => 'system-message-container']); } /** @@ -765,7 +765,7 @@ public function publishModule($module) $I->searchForItem($module); $I->checkAllResults(); $I->click(['xpath' => "//div[@id='toolbar-publish']/button"]); - $I->waitForText('1 module successfully published.', 30, ['id' => 'system-message-container']); + $I->waitForText(' published.', 30, ['id' => 'system-message-container']); } /** @@ -787,7 +787,7 @@ public function displayModuleOnAllPages($module) $I->click(['id' => 'jform_assignment_chzn']); $I->click(['xpath' => "//li[@data-option-array-index='0']"]); $I->click(['xpath' => "//div[@id='toolbar-apply']/button"]); - $I->waitForText('Module successfully saved', 30, ['id' => 'system-message-container']); + $I->waitForText('Module saved', 30, ['id' => 'system-message-container']); } /** @@ -916,7 +916,7 @@ public function createMenuItem($menuTitle, $menuCategory, $menuItem, $menu = 'Ma $I->debug('I save the menu'); $I->click("Save"); - $I->waitForText('Menu item successfully saved', '60', ['id' => 'system-message-container']); + $I->waitForText('Menu item saved', '60', ['id' => 'system-message-container']); } /** From d167e0d22cad2dbde7f078f33a67329bb93fca3d Mon Sep 17 00:00:00 2001 From: Hans Erik Jepsen Date: Fri, 28 Jul 2017 20:20:04 +0200 Subject: [PATCH 2/2] [Fix] doFrontendLogout() Fixes redirect issue after logging out in J3.7.x --- src/JoomlaBrowser.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php index 0545c7d..512f5c0 100644 --- a/src/JoomlaBrowser.php +++ b/src/JoomlaBrowser.php @@ -123,6 +123,7 @@ public function doFrontendLogout() $I->amOnPage('/index.php?option=com_users&view=login'); $this->debug('I click Logout button'); $I->click(['xpath' => "//div[@class='logout']//button[contains(text(), 'Log out')]"]); + $I->amOnPage('/index.php?option=com_users&view=login'); $this->debug('I wait to see Login form'); $I->waitForElement(['xpath' => "//div[@class='login']//button[contains(text(), 'Log in')]"], 30); $I->seeElement(['xpath' => "//div[@class='login']//button[contains(text(), 'Log in')]"]);