Skip to content

Commit ca3523b

Browse files
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 4 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
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
{

0 commit comments

Comments
 (0)