Skip to content

MQE-632 #21

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 2 commits into from
Jan 9, 2018
Merged

MQE-632 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
230792a
Fix codesniffer warnings
tomreece Jan 8, 2018
d520b5e
MQE-632: Add support to check full url of the page seeFullUrlEquals
tomreece Jan 9, 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
12 changes: 10 additions & 2 deletions dev/tests/verification/Resources/BasicFunctionalTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class BasicFunctionalTestCest
$I->dontSeeCheckboxIsChecked(".functionalTestSelector");
$I->dontSeeCookie("someInput");
$I->dontSeeCurrentUrlEquals("/functionalUrl");
$I->dontSeeCurrentUrlMatches("/functionalUrl");
$I->dontSeeCurrentUrlMatches("/[0-9]+/");
$I->dontSeeElement(".functionalTestSelector");
$I->dontSeeElementInDOM(".functionalTestSelector");
$I->dontSeeInCurrentUrl("/functionalUrl");
Expand Down Expand Up @@ -97,7 +97,7 @@ class BasicFunctionalTestCest
$I->seeCheckboxIsChecked(".functionalTestSelector");
$I->seeCookie("someInput");
$I->seeCurrentUrlEquals("/functionalUrl");
$I->seeCurrentUrlMatches("/functionalUrl");
$I->seeCurrentUrlMatches("/[0-9]+/");
$I->seeElement(".functionalTestSelector");
$I->seeElementInDOM(".functionalTestSelector");
$I->seeInCurrentUrl("/functionalUrl");
Expand All @@ -124,5 +124,13 @@ class BasicFunctionalTestCest
$I->waitForElementVisible(".functionalTestSelector", 30);
$I->waitForJS("someJsFunction", 30);
$I->waitForText("someInput", 30, ".functionalTestSelector");
$I->dontSeeFullUrlEquals("www.magento.com");
$I->dontSeeFullUrlMatches("/[0-9]+/");
$I->dontSeeInFullUrl("https://www.magento.com");
$grabFromFullUrl1 = $I->grabFromFullUrl("/[0-9]+/");
$grabFromFullUrl2 = $I->grabFromFullUrl();
$I->seeFullUrlEquals("http://magento.com/something");
$I->seeFullUrlMatches("/[0-9]+/");
$I->seeInFullUrl("magento");
}
}
14 changes: 11 additions & 3 deletions dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dontSeeCheckboxIsChecked selector=".functionalTestSelector" stepKey="dontSeeCheckboxIsCheckedKey1"/>
<dontSeeCookie userInput="someInput" stepKey="dontSeeCookieKey1"/>
<dontSeeCurrentUrlEquals url="/functionalUrl" stepKey="dontSeeCurrentUrlEqualsKey1"/>
<dontSeeCurrentUrlMatches url="/functionalUrl" stepKey="dontSeeCurrentUrlMatchesKey1"/>
<dontSeeCurrentUrlMatches regex="/[0-9]+/" stepKey="dontSeeCurrentUrlMatchesKey1"/>
<dontSeeElement selector=".functionalTestSelector" stepKey="dontSeeElementKey1"/>
<dontSeeElementInDOM selector=".functionalTestSelector" stepKey="dontSeeElementInDOMKey1"/>
<dontSeeInCurrentUrl url="/functionalUrl" stepKey="dontSeeInCurrentUrlKey1"/>
Expand All @@ -55,7 +55,7 @@
<fillField selector=".functionalTestSelector" userInput="0" stepKey="fillFieldKey2" />
<grabAttributeFrom selector=".functionalTestSelector" userInput="someInput" stepKey="grabAttributeFromKey1" />
<grabCookie userInput="grabCookieInput" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookieKey1" />
<grabFromCurrentUrl url="/grabCurrentUrl" stepKey="grabFromCurrentUrlKey1" />
<grabFromCurrentUrl regex="/grabCurrentUrl" stepKey="grabFromCurrentUrlKey1" />
<grabMultiple selector=".functionalTestSelector" stepKey="grabMultipleKey1" />
<grabTextFrom selector=".functionalTestSelector" stepKey="grabTextFromKey1" />
<grabValueFrom selector=".functionalTestSelector" stepKey="grabValueFromKey1" />
Expand All @@ -78,7 +78,7 @@
<seeCheckboxIsChecked selector=".functionalTestSelector" stepKey="seeCheckboxIsCheckedKey1"/>
<seeCookie userInput="someInput" stepKey="seeCookieKey1"/>
<seeCurrentUrlEquals url="/functionalUrl" stepKey="seeCurrentUrlEqualsKey1"/>
<seeCurrentUrlMatches url="/functionalUrl" stepKey="seeCurrentUrlMatchesKey1"/>
<seeCurrentUrlMatches regex="/[0-9]+/" stepKey="seeCurrentUrlMatchesKey1"/>
<seeElement selector=".functionalTestSelector" stepKey="seeElementKey1"/>
<seeElementInDOM selector=".functionalTestSelector" stepKey="seeElementInDOMKey1"/>
<seeInCurrentUrl url="/functionalUrl" stepKey="seeInCurrentUrlKey1"/>
Expand All @@ -105,5 +105,13 @@
<waitForElementVisible selector=".functionalTestSelector" time="30" stepKey="waitForElementVisibleKey1" />
<waitForJS function="someJsFunction" time="30" stepKey="waitForJSKey1" />
<waitForText selector=".functionalTestSelector" userInput="someInput" time="30" stepKey=""/>
<dontSeeFullUrlEquals url="www.magento.com" stepKey="dontSeeFullUrlEquals1"/>
<dontSeeFullUrlMatches regex="/[0-9]+/" stepKey="dontSeeFullUrlMatches1"/>
<dontSeeInFullUrl url="https://www.magento.com" stepKey="dontSeeInFullUrl1"/>
<grabFromFullUrl regex="/[0-9]+/" stepKey="grabFromFullUrl1"/>
<grabFromFullUrl stepKey="grabFromFullUrl2"/>
<seeFullUrlEquals url="http://magento.com/something" stepKey="seeFullUrlEquals1"/>
<seeFullUrlMatches regex="/[0-9]+/" stepKey="seeFullUrlMatches1"/>
<seeInFullUrl url="magento" stepKey="seeInFullUrl1"/>
</test>
</tests>
Loading