Skip to content

Commit e2b8dde

Browse files
authoredJan 9, 2018
Merge pull request magento#21 from magento/MQE-632
2 parents 7de6505 + d520b5e commit e2b8dde

File tree

6 files changed

+210
-18
lines changed

6 files changed

+210
-18
lines changed
 

‎dev/tests/verification/Resources/BasicFunctionalTest.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class BasicFunctionalTestCest
5757
$I->dontSeeCheckboxIsChecked(".functionalTestSelector");
5858
$I->dontSeeCookie("someInput");
5959
$I->dontSeeCurrentUrlEquals("/functionalUrl");
60-
$I->dontSeeCurrentUrlMatches("/functionalUrl");
60+
$I->dontSeeCurrentUrlMatches("/[0-9]+/");
6161
$I->dontSeeElement(".functionalTestSelector");
6262
$I->dontSeeElementInDOM(".functionalTestSelector");
6363
$I->dontSeeInCurrentUrl("/functionalUrl");
@@ -97,7 +97,7 @@ class BasicFunctionalTestCest
9797
$I->seeCheckboxIsChecked(".functionalTestSelector");
9898
$I->seeCookie("someInput");
9999
$I->seeCurrentUrlEquals("/functionalUrl");
100-
$I->seeCurrentUrlMatches("/functionalUrl");
100+
$I->seeCurrentUrlMatches("/[0-9]+/");
101101
$I->seeElement(".functionalTestSelector");
102102
$I->seeElementInDOM(".functionalTestSelector");
103103
$I->seeInCurrentUrl("/functionalUrl");
@@ -124,5 +124,13 @@ class BasicFunctionalTestCest
124124
$I->waitForElementVisible(".functionalTestSelector", 30);
125125
$I->waitForJS("someJsFunction", 30);
126126
$I->waitForText("someInput", 30, ".functionalTestSelector");
127+
$I->dontSeeFullUrlEquals("www.magento.com");
128+
$I->dontSeeFullUrlMatches("/[0-9]+/");
129+
$I->dontSeeInFullUrl("https://www.magento.com");
130+
$grabFromFullUrl1 = $I->grabFromFullUrl("/[0-9]+/");
131+
$grabFromFullUrl2 = $I->grabFromFullUrl();
132+
$I->seeFullUrlEquals("http://magento.com/something");
133+
$I->seeFullUrlMatches("/[0-9]+/");
134+
$I->seeInFullUrl("magento");
127135
}
128136
}

‎dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dontSeeCheckboxIsChecked selector=".functionalTestSelector" stepKey="dontSeeCheckboxIsCheckedKey1"/>
3939
<dontSeeCookie userInput="someInput" stepKey="dontSeeCookieKey1"/>
4040
<dontSeeCurrentUrlEquals url="/functionalUrl" stepKey="dontSeeCurrentUrlEqualsKey1"/>
41-
<dontSeeCurrentUrlMatches url="/functionalUrl" stepKey="dontSeeCurrentUrlMatchesKey1"/>
41+
<dontSeeCurrentUrlMatches regex="/[0-9]+/" stepKey="dontSeeCurrentUrlMatchesKey1"/>
4242
<dontSeeElement selector=".functionalTestSelector" stepKey="dontSeeElementKey1"/>
4343
<dontSeeElementInDOM selector=".functionalTestSelector" stepKey="dontSeeElementInDOMKey1"/>
4444
<dontSeeInCurrentUrl url="/functionalUrl" stepKey="dontSeeInCurrentUrlKey1"/>
@@ -55,7 +55,7 @@
5555
<fillField selector=".functionalTestSelector" userInput="0" stepKey="fillFieldKey2" />
5656
<grabAttributeFrom selector=".functionalTestSelector" userInput="someInput" stepKey="grabAttributeFromKey1" />
5757
<grabCookie userInput="grabCookieInput" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookieKey1" />
58-
<grabFromCurrentUrl url="/grabCurrentUrl" stepKey="grabFromCurrentUrlKey1" />
58+
<grabFromCurrentUrl regex="/grabCurrentUrl" stepKey="grabFromCurrentUrlKey1" />
5959
<grabMultiple selector=".functionalTestSelector" stepKey="grabMultipleKey1" />
6060
<grabTextFrom selector=".functionalTestSelector" stepKey="grabTextFromKey1" />
6161
<grabValueFrom selector=".functionalTestSelector" stepKey="grabValueFromKey1" />
@@ -78,7 +78,7 @@
7878
<seeCheckboxIsChecked selector=".functionalTestSelector" stepKey="seeCheckboxIsCheckedKey1"/>
7979
<seeCookie userInput="someInput" stepKey="seeCookieKey1"/>
8080
<seeCurrentUrlEquals url="/functionalUrl" stepKey="seeCurrentUrlEqualsKey1"/>
81-
<seeCurrentUrlMatches url="/functionalUrl" stepKey="seeCurrentUrlMatchesKey1"/>
81+
<seeCurrentUrlMatches regex="/[0-9]+/" stepKey="seeCurrentUrlMatchesKey1"/>
8282
<seeElement selector=".functionalTestSelector" stepKey="seeElementKey1"/>
8383
<seeElementInDOM selector=".functionalTestSelector" stepKey="seeElementInDOMKey1"/>
8484
<seeInCurrentUrl url="/functionalUrl" stepKey="seeInCurrentUrlKey1"/>
@@ -105,5 +105,13 @@
105105
<waitForElementVisible selector=".functionalTestSelector" time="30" stepKey="waitForElementVisibleKey1" />
106106
<waitForJS function="someJsFunction" time="30" stepKey="waitForJSKey1" />
107107
<waitForText selector=".functionalTestSelector" userInput="someInput" time="30" stepKey=""/>
108+
<dontSeeFullUrlEquals url="www.magento.com" stepKey="dontSeeFullUrlEquals1"/>
109+
<dontSeeFullUrlMatches regex="/[0-9]+/" stepKey="dontSeeFullUrlMatches1"/>
110+
<dontSeeInFullUrl url="https://www.magento.com" stepKey="dontSeeInFullUrl1"/>
111+
<grabFromFullUrl regex="/[0-9]+/" stepKey="grabFromFullUrl1"/>
112+
<grabFromFullUrl stepKey="grabFromFullUrl2"/>
113+
<seeFullUrlEquals url="http://magento.com/something" stepKey="seeFullUrlEquals1"/>
114+
<seeFullUrlMatches regex="/[0-9]+/" stepKey="seeFullUrlMatches1"/>
115+
<seeInFullUrl url="magento" stepKey="seeInFullUrl1"/>
108116
</test>
109117
</tests>

0 commit comments

Comments
 (0)
Please sign in to comment.