Skip to content

Commit ca3523b

Browse files
okolesnykokolesnyk
committed
Merge branch 'develop' of github.com:magento/magento2-functional-testing-framework into MQE-617
2 parents f074db6 + 0715c86 commit ca3523b

File tree

51 files changed

+453
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+453
-75
lines changed

‎dev/tests/_bootstrap.php

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
foreach ($TEST_ENVS as $key => $value) {
2727
$_ENV[$key] = $value;
28+
putenv("{$key}=${value}");
2829
}
2930

3031
// Add our test module to the whitelist

‎dev/tests/unit/Magento/FunctionalTestFramework/Page/Handlers/PageObjectHandlerTest.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@ public function testGetPageObject()
2424
"section" => [
2525
"someSection1" => [],
2626
"someSection2" => []
27-
]
27+
],
28+
"area" => "test"
2829
],
2930
"testPage2" => [
3031
"url" => "testURL2",
3132
"module" => "testModule2",
3233
"parameterized" => true,
3334
"section" => [
3435
"someSection1" => []
35-
]
36+
],
37+
"area" => "test"
3638
]];
3739
$this->setMockParserOutput($mockData);
3840

‎dev/tests/unit/Magento/FunctionalTestFramework/Page/Objects/PageObjectTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class PageObjectTest extends TestCase
1919
*/
2020
public function testHasSection()
2121
{
22-
$page = new PageObject('name', 'urlPath', 'module', ['section1', 'section2'], false);
22+
$page = new PageObject('name', 'urlPath', 'module', ['section1', 'section2'], false, 'area');
2323
$this->assertTrue($page->hasSection('section1'));
2424
}
2525

@@ -28,7 +28,7 @@ public function testHasSection()
2828
*/
2929
public function testDoesntHaveSection()
3030
{
31-
$page = new PageObject('name', 'urlPath', 'module', ['section1', 'section2'], false);
31+
$page = new PageObject('name', 'urlPath', 'module', ['section1', 'section2'], false, 'area');
3232
$this->assertFalse($page->hasSection('section3'));
3333
}
3434
}

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public function testResolveUrl()
198198
$actionObject = new ActionObject('merge123', 'amOnPage', [
199199
'url' => '{{PageObject.url}}'
200200
]);
201-
$pageObject = new PageObject('PageObject', '/replacement/url.html', 'Test', [], false);
201+
$pageObject = new PageObject('PageObject', '/replacement/url.html', 'Test', [], false, "test");
202202
$instance = AspectMock::double(PageObjectHandler::class, ['getObject' => $pageObject])
203203
->make(); // bypass the private constructor
204204
AspectMock::double(PageObjectHandler::class, ['getInstance' => $instance]);

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithDataOverrideTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithDataOverrideTest(AcceptanceTester $I)
5455
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithDataTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithDataTest(AcceptanceTester $I)
5455
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I)
3031
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I)
3031
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithNoArgumentsCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithNoArguments(AcceptanceTester $I)
3031
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithNoDefaultTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithNoDefaultTest(AcceptanceTester $I)
5455
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I)
3031
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithPersistedDataCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithPersistedData(AcceptanceTester $I)
5455
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithSingleParameterSelectorFromDefaultArgument(AcceptanceTester $I)
3031
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest
2525
* @Parameter(name = "AcceptanceTester", value="$I")
2626
* @param AcceptanceTester $I
2727
* @return void
28+
* @throws \Exception
2829
*/
2930
public function ActionGroupWithSingleParameterSelectorFromPassedArgument(AcceptanceTester $I)
3031
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ActionGroupWithTopLevelPersistedDataCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ActionGroupWithTopLevelPersistedData(AcceptanceTester $I)
5455
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ArgumentWithSameNameAsElementCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function ArgumentWithSameNameAsElement(AcceptanceTester $I)
5455
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class AssertTestCest
3636
* @Parameter(name = "AcceptanceTester", value="$I")
3737
* @param AcceptanceTester $I
3838
* @return void
39+
* @throws \Exception
3940
*/
4041
public function AssertTest(AcceptanceTester $I)
4142
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class BasicActionGroupTestCest
4343
* @Parameter(name = "AcceptanceTester", value="$I")
4444
* @param AcceptanceTester $I
4545
* @return void
46+
* @throws \Exception
4647
*/
4748
public function BasicActionGroupTest(AcceptanceTester $I)
4849
{

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

+11-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class BasicFunctionalTestCest
3838
* @Parameter(name = "AcceptanceTester", value="$I")
3939
* @param AcceptanceTester $I
4040
* @return void
41+
* @throws \Exception
4142
*/
4243
public function BasicFunctionalTest(AcceptanceTester $I)
4344
{
@@ -57,7 +58,7 @@ class BasicFunctionalTestCest
5758
$I->dontSeeCheckboxIsChecked(".functionalTestSelector");
5859
$I->dontSeeCookie("someInput");
5960
$I->dontSeeCurrentUrlEquals("/functionalUrl");
60-
$I->dontSeeCurrentUrlMatches("/functionalUrl");
61+
$I->dontSeeCurrentUrlMatches("/[0-9]+/");
6162
$I->dontSeeElement(".functionalTestSelector");
6263
$I->dontSeeElementInDOM(".functionalTestSelector");
6364
$I->dontSeeInCurrentUrl("/functionalUrl");
@@ -97,7 +98,7 @@ class BasicFunctionalTestCest
9798
$I->seeCheckboxIsChecked(".functionalTestSelector");
9899
$I->seeCookie("someInput");
99100
$I->seeCurrentUrlEquals("/functionalUrl");
100-
$I->seeCurrentUrlMatches("/functionalUrl");
101+
$I->seeCurrentUrlMatches("/[0-9]+/");
101102
$I->seeElement(".functionalTestSelector");
102103
$I->seeElementInDOM(".functionalTestSelector");
103104
$I->seeInCurrentUrl("/functionalUrl");
@@ -124,5 +125,13 @@ class BasicFunctionalTestCest
124125
$I->waitForElementVisible(".functionalTestSelector", 30);
125126
$I->waitForJS("someJsFunction", 30);
126127
$I->waitForText("someInput", 30, ".functionalTestSelector");
128+
$I->dontSeeFullUrlEquals("www.magento.com");
129+
$I->dontSeeFullUrlMatches("/[0-9]+/");
130+
$I->dontSeeInFullUrl("https://www.magento.com");
131+
$grabFromFullUrl1 = $I->grabFromFullUrl("/[0-9]+/");
132+
$grabFromFullUrl2 = $I->grabFromFullUrl();
133+
$I->seeFullUrlEquals("http://magento.com/something");
134+
$I->seeFullUrlMatches("/[0-9]+/");
135+
$I->seeInFullUrl("magento");
127136
}
128137
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class DataReplacementTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function DataReplacementTest(AcceptanceTester $I)
2829
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class LocatorFunctionTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function LocatorFunctionTest(AcceptanceTester $I)
2829
{

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

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class MergeFunctionalTestCest
3939
* @Parameter(name = "AcceptanceTester", value="$I")
4040
* @param AcceptanceTester $I
4141
* @return void
42+
* @throws \Exception
4243
*/
4344
public function BasicMergeTest(AcceptanceTester $I)
4445
{
@@ -61,6 +62,7 @@ class MergeFunctionalTestCest
6162
* @Parameter(name = "AcceptanceTester", value="$I")
6263
* @param AcceptanceTester $I
6364
* @return void
65+
* @throws \Exception
6466
*/
6567
public function MergedReferencesTest(AcceptanceTester $I)
6668
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class MergedActionGroupTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function MergedActionGroupTest(AcceptanceTester $I)
5455
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class MultipleActionGroupsTestCest
4949
* @Parameter(name = "AcceptanceTester", value="$I")
5050
* @param AcceptanceTester $I
5151
* @return void
52+
* @throws \Exception
5253
*/
5354
public function MultipleActionGroupsTest(AcceptanceTester $I)
5455
{

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

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class PageReplacementTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function PageReplacementTest(AcceptanceTester $I)
2829
{
@@ -38,5 +39,7 @@ class PageReplacementTestCest
3839
$I->amOnPage("/John/StringLiteral2.html");
3940
$I->amOnPage("/John/" . $datakey->getCreatedDataByName('firstname') . ".html");
4041
$I->amOnPage("/" . $datakey->getCreatedDataByName('firstname') . "/StringLiteral2.html");
42+
$I->amOnPage("/admin/backend");
43+
$I->amOnUrl("http://myFullUrl.com/");
4144
}
4245
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class ParameterArrayTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function ParameterArrayTest(AcceptanceTester $I)
2829
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class PersistedReplacementTestCest
3636
* @Parameter(name = "AcceptanceTester", value="$I")
3737
* @param AcceptanceTester $I
3838
* @return void
39+
* @throws \Exception
3940
*/
4041
public function PersistedReplacementTest(AcceptanceTester $I)
4142
{

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

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class SectionReplacementTestCest
2323
* @Parameter(name = "AcceptanceTester", value="$I")
2424
* @param AcceptanceTester $I
2525
* @return void
26+
* @throws \Exception
2627
*/
2728
public function SectionReplacementTest(AcceptanceTester $I)
2829
{

‎dev/tests/verification/TestModule/Page/SamplePage.xml

+10-4
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,22 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="SamplePage" url="/{{var1}}/{{var2}}.html" module="SampleTests" parameterized="true">
11+
<page name="SamplePage" url="/{{var1}}/{{var2}}.html" area="storefront" module="SampleTests" parameterized="true">
1212
<section name="SampleSection"/>
1313
</page>
14-
<page name="NoParamPage" url="/page.html" module="SampleTests">
14+
<page name="NoParamPage" url="/page.html" area="storefront" module="SampleTests">
1515
<section name="SampleSection"/>
1616
</page>
17-
<page name="OneParamPage" url="/{{var1}}/page.html" module="SampleTests" parameterized="true">
17+
<page name="OneParamPage" url="/{{var1}}/page.html" area="storefront" module="SampleTests" parameterized="true">
1818
<section name="SampleSection"/>
1919
</page>
20-
<page name="TwoParamPage" url="/{{var1}}/{{var2}}.html" module="SampleTests" parameterized="true">
20+
<page name="TwoParamPage" url="/{{var1}}/{{var2}}.html" area="storefront" module="SampleTests" parameterized="true">
21+
<section name="SampleSection"/>
22+
</page>
23+
<page name="AdminPage" url="/backend" area="admin" module="SampleTests">
24+
<section name="SampleSection"/>
25+
</page>
26+
<page name="ExternalPage" url="http://myFullUrl.com/" area="external" module="SampleTests">
2127
<section name="SampleSection"/>
2228
</page>
2329
</pages>

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

+11-3
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>

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

+5
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,10 @@
1818
<amOnPage stepKey="twoParamPageStringData" url="{{TwoParamPage.url(simpleData.firstname, 'StringLiteral2')}}"/>
1919
<amOnPage stepKey="twoParamPageDataPersist" url="{{TwoParamPage.url(simpleData.firstname, $datakey.firstname$)}}"/>
2020
<amOnPage stepKey="twoParamPagePersistString" url="{{TwoParamPage.url($datakey.firstname$, 'StringLiteral2')}}"/>
21+
<amOnPage stepKey="onAdminPage" url="{{AdminPage.url}}"/>
22+
<amOnUrl stepKey="onExternalPage" url="{{ExternalPage.url}}"/>
23+
</test>
24+
<test name="ExternalPageTestBadReference">
25+
<amOnPage stepKey="onExternalPage" url="{{ExternalPage.url}}"/>
2126
</test>
2227
</tests>

0 commit comments

Comments
 (0)