Skip to content

MQE-1457 #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 19, 2019
Merged

MQE-1457 #334

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a070a32
magento-pangolin/magento2-functional-testing-framework#MQE-1457: [PWA…
ivy00johns Apr 17, 2019
2c84791
magento-pangolin/magento2-functional-testing-framework#MQE-1457: [PWA…
ivy00johns Apr 18, 2019
bd990cc
Merge branch 'develop' into MQE-1457
ivy00johns Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/Magento/FunctionalTestingFramework/Module/MagentoPwaWebDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class MagentoPwaWebDriver extends MagentoWebDriver
{
/**
* Wait for a PWA Element to NOT be visible using JavaScript.
* Add the WAIT_TIMEOUT variable to your .env file for this action.
*
* @param null $selector
* @param null $timeout
Expand All @@ -25,8 +26,6 @@ class MagentoPwaWebDriver extends MagentoWebDriver
*/
public function waitForPwaElementNotVisible($selector, $timeout = null)
{
$timeout = $timeout ?? $this->_getConfig()['pageload_timeout'];

// Determine what type of Selector is used.
// Then use the correct JavaScript to locate the Element.
if (\Codeception\Util\Locator::isXPath($selector)) {
Expand All @@ -38,6 +37,7 @@ public function waitForPwaElementNotVisible($selector, $timeout = null)

/**
* Wait for a PWA Element to be visible using JavaScript.
* Add the WAIT_TIMEOUT variable to your .env file for this action.
*
* @param null $selector
* @param null $timeout
Expand All @@ -46,8 +46,6 @@ public function waitForPwaElementNotVisible($selector, $timeout = null)
*/
public function waitForPwaElementVisible($selector, $timeout = null)
{
$timeout = $timeout ?? $this->_getConfig()['pageload_timeout'];

// Determine what type of Selector is used.
// Then use the correct JavaScript to locate the Element.
if (\Codeception\Util\Locator::isXPath($selector)) {
Expand Down