Skip to content

Added the 'waitForPageLoad' action after every 'amOnPage' action #79

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 5 commits into from
Apr 30, 2018
Merged

Added the 'waitForPageLoad' action after every 'amOnPage' action #79

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d26a1c1
Added the 'waitForPageLoad' action after every 'amOnPage' action
Cristian101 Apr 2, 2018
c5624e2
Cleaned up some code
Cristian101 Apr 2, 2018
f52a408
Changed the location of the rewrite
Cristian101 Apr 29, 2018
4281fd4
Merge branch 'develop' of github.com:magento/magento2-functional-test…
Cristian101 Apr 29, 2018
b3cff79
Fixed error
Cristian101 Apr 30, 2018
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
15 changes: 15 additions & 0 deletions src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,4 +1866,19 @@ private function printRuleErrorToConsole($key, $tagName, $attributes)
$message .= '" can be use for action "' . $tagName . "\".\n";
print $message;
}

/**
* Go to a page and wait for ajax requests to finish
*
* @param string $page
* @throws \Exception
* @return void
*/
public function amOnPage($page)
Copy link
Contributor

@KevinBKozan KevinBKozan Apr 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume that the goal here was to override the WebDriver's definition of amOnPage correct? If so, this function belongs in MagentoWebDriver.php, where we provide custom functions and redefinitions of some of the base Codeception commands.

{
$url = Uri::appendPath($this->config['url'], $page);
$this->debugSection('GET', $url);
$this->webDriver->get($url);
Copy link
Contributor

@KevinBKozan KevinBKozan Apr 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of defining these three lines, you should just call parent::amOnPage($page) to prevent duplicate code (since we're not changing amOnPage behaviour, just adding to it).

$this->waitForPageLoad();
}
}