Skip to content

Commit df4ad99

Browse files
KevinBKozanKevinBKozan
committed
Merge branch 'develop' into MQE-1376
1 parent b5f6488 commit df4ad99

File tree

67 files changed

+899
-84
lines changed

Some content is hidden

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

67 files changed

+899
-84
lines changed

‎dev/tests/unit/Magento/FunctionalTestFramework/Util/DocGeneratorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testBasicCreateDocumentation()
2828
];
2929
$actionGroupUnderTest = (new ActionGroupObjectBuilder())
3030
->withAnnotations($annotations)
31-
->withFilenames(["filename"])
31+
->withFilename("filename")
3232
->build();
3333
$docGenerator = new DocGenerator();
3434
$docGenerator->createDocumentation(
@@ -60,7 +60,7 @@ public function testCreateDocumentationWithOverwrite()
6060
];
6161
$actionGroupUnderTest = (new ActionGroupObjectBuilder())
6262
->withAnnotations($annotations)
63-
->withFilenames(["filename"])
63+
->withFilename("filename")
6464
->build();
6565
$docGenerator = new DocGenerator();
6666
$docGenerator->createDocumentation(
@@ -75,7 +75,7 @@ public function testCreateDocumentationWithOverwrite()
7575
];
7676
$actionGroupUnderTest = (new ActionGroupObjectBuilder())
7777
->withAnnotations($annotations)
78-
->withFilenames(["filename"])
78+
->withFilename("filename")
7979
->build();
8080
$docGenerator = new DocGenerator();
8181
$docGenerator->createDocumentation(
@@ -107,7 +107,7 @@ public function testCreateDocumentationNotCleanException()
107107
];
108108
$actionGroupUnderTest = (new ActionGroupObjectBuilder())
109109
->withAnnotations($annotations)
110-
->withFilenames(["filename"])
110+
->withFilename("filename")
111111
->build();
112112
$docGenerator = new DocGenerator();
113113
$docGenerator->createDocumentation(

‎dev/tests/unit/Resources/alteredDocumentation.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ alteredDescription
1212

1313
Located in:
1414

15+
- filename
1516
***

‎dev/tests/unit/Resources/basicDocumentation.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ someDescription
1212

1313
Located in:
1414

15+
- filename
1516
***

‎dev/tests/unit/Util/ActionGroupObjectBuilder.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ActionGroupObjectBuilder
5353
*
5454
* @var string
5555
*/
56-
private $filenames = [];
56+
private $filename = [];
5757

5858
/**
5959
* Setter for the Action Group Object name
@@ -116,14 +116,14 @@ public function withExtendedAction($extendedActionGroup)
116116
}
117117

118118
/**
119-
* Setter for the Action Group Object filenames
119+
* Setter for the Action Group Object filename
120120
*
121-
* @param array $filenames
121+
* @param string $filename
122122
* @return ActionGroupObjectBuilder
123123
*/
124-
public function withFilenames($filenames)
124+
public function withFilename($filename)
125125
{
126-
$this->filenames = $filenames;
126+
$this->filename = $filename;
127127
return $this;
128128
}
129129

@@ -150,7 +150,7 @@ public function build()
150150
$this->arguments,
151151
$this->actionObjects,
152152
$this->extends,
153-
$this->filenames
153+
$this->filename
154154
);
155155
}
156156
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ class ActionGroupContainsStepKeyInArgTextCest
2424
*/
2525
public function _before(AcceptanceTester $I)
2626
{
27+
$I->comment("Entering Action Group actionGroupContainsStepKeyInArgValue (actionGroup)");
2728
$I->see("arg1", ".selector");
29+
$I->comment("Exiting Action Group actionGroupContainsStepKeyInArgValue (actionGroup)");
2830
}
2931

3032
/**
@@ -36,6 +38,8 @@ class ActionGroupContainsStepKeyInArgTextCest
3638
*/
3739
public function ActionGroupContainsStepKeyInArgText(AcceptanceTester $I)
3840
{
41+
$I->comment("Entering Action Group actionGroupContainsStepKeyInArgValue (actionGroup)");
3942
$I->see("arg1", ".selector");
43+
$I->comment("Exiting Action Group actionGroupContainsStepKeyInArgValue (actionGroup)");
4044
}
4145
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ class ActionGroupMergedViaInsertAfterCest
2727
*/
2828
public function ActionGroupMergedViaInsertAfter(AcceptanceTester $I)
2929
{
30+
$I->comment("Entering Action Group FunctionalActionGroupForMassMergeAfter (keyone)");
3031
$I->fillField("#foo", "foo");
3132
$I->fillField("#bar", "bar");
3233
$I->click("#foo2");
3334
$I->click("#bar2");
3435
$I->click("#baz2");
3536
$I->fillField("#baz", "baz");
37+
$I->comment("Exiting Action Group FunctionalActionGroupForMassMergeAfter (keyone)");
3638
}
3739
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ class ActionGroupMergedViaInsertBeforeCest
2727
*/
2828
public function ActionGroupMergedViaInsertBefore(AcceptanceTester $I)
2929
{
30+
$I->comment("Entering Action Group FunctionalActionGroupForMassMergeBefore (keyone)");
3031
$I->fillField("#foo", "foo");
3132
$I->click("#foo2");
3233
$I->click("#bar2");
3334
$I->click("#baz2");
3435
$I->fillField("#bar", "bar");
3536
$I->fillField("#baz", "baz");
37+
$I->comment("Exiting Action Group FunctionalActionGroupForMassMergeBefore (keyone)");
3638
}
3739
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ class ActionGroupSkipReadinessCest
2727
*/
2828
public function ActionGroupSkipReadiness(AcceptanceTester $I)
2929
{
30+
$I->comment("Entering Action Group actionGroupWithSkipReadinessActions (skipReadinessActionGroup)");
3031
$I->skipReadinessCheck(true);
3132
$I->comment("ActionGroupSkipReadiness");
3233
$I->skipReadinessCheck(false);
34+
$I->comment("Exiting Action Group actionGroupWithSkipReadinessActions (skipReadinessActionGroup)");
3335
}
3436
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ class ActionGroupToExtendCest
2727
*/
2828
public function ActionGroupToExtend(AcceptanceTester $I)
2929
{
30+
$I->comment("Entering Action Group ActionGroupToExtend (actionGroup)");
3031
$grabProductsActionGroup = $I->grabMultiple("selector");
3132
$I->assertCount(99, $grabProductsActionGroup);
33+
$I->comment("Exiting Action Group ActionGroupToExtend (actionGroup)");
3234
}
3335
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class ActionGroupUsingCreateDataCest
2424
*/
2525
public function _before(AcceptanceTester $I)
2626
{
27+
$I->comment("Entering Action Group actionGroupWithCreateData (Key1)");
2728
$I->amGoingTo("create entity that has the stepKey: createCategoryKey1");
2829
PersistedObjectHandler::getInstance()->createEntity(
2930
"createCategoryKey1",
@@ -40,6 +41,7 @@ class ActionGroupUsingCreateDataCest
4041
["createCategoryKey1"],
4142
null
4243
);
44+
$I->comment("Exiting Action Group actionGroupWithCreateData (Key1)");
4345
}
4446

4547
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ class ActionGroupUsingNestedArgumentCest
2727
*/
2828
public function ActionGroupUsingNestedArgument(AcceptanceTester $I)
2929
{
30+
$I->comment("Entering Action Group ActionGroupToExtend (actionGroup)");
3031
$grabProductsActionGroup = $I->grabMultiple("selector");
3132
$I->assertCount(99, $grabProductsActionGroup);
33+
$I->comment("Exiting Action Group ActionGroupToExtend (actionGroup)");
3234
}
3335
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ class ActionGroupWithDataOverrideTestCest
3333
[],
3434
null
3535
);
36+
$I->comment("Entering Action Group FunctionalActionGroup (beforeGroup)");
3637
$I->fillField("#foo", "myData1");
3738
$I->fillField("#bar", "myData2");
39+
$I->comment("Exiting Action Group FunctionalActionGroup (beforeGroup)");
3840
}
3941

4042
/**
@@ -43,8 +45,10 @@ class ActionGroupWithDataOverrideTestCest
4345
*/
4446
public function _after(AcceptanceTester $I)
4547
{
48+
$I->comment("Entering Action Group FunctionalActionGroup (afterGroup)");
4649
$I->fillField("#foo", "myData1");
4750
$I->fillField("#bar", "myData2");
51+
$I->comment("Exiting Action Group FunctionalActionGroup (afterGroup)");
4852
}
4953

5054
/**
@@ -68,11 +72,13 @@ class ActionGroupWithDataOverrideTestCest
6872
public function ActionGroupWithDataOverrideTest(AcceptanceTester $I)
6973
{
7074
$I->amOnPage("/someUrl");
75+
$I->comment("Entering Action Group FunctionalActionGroupWithData (actionGroupWithDataOverride1)");
7176
$I->amOnPage("/John/Doe.html");
7277
$I->fillField("#foo", "John");
7378
$I->fillField("#bar", "Doe");
7479
$I->searchAndMultiSelectOption("#foo", ["John", "Doe"]);
7580
$I->see("#element .John");
81+
$I->comment("Exiting Action Group FunctionalActionGroupWithData (actionGroupWithDataOverride1)");
7682
$I->click("loginButton");
7783
}
7884
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ class ActionGroupWithDataTestCest
3333
[],
3434
null
3535
);
36+
$I->comment("Entering Action Group FunctionalActionGroup (beforeGroup)");
3637
$I->fillField("#foo", "myData1");
3738
$I->fillField("#bar", "myData2");
39+
$I->comment("Exiting Action Group FunctionalActionGroup (beforeGroup)");
3840
}
3941

4042
/**
@@ -43,8 +45,10 @@ class ActionGroupWithDataTestCest
4345
*/
4446
public function _after(AcceptanceTester $I)
4547
{
48+
$I->comment("Entering Action Group FunctionalActionGroup (afterGroup)");
4649
$I->fillField("#foo", "myData1");
4750
$I->fillField("#bar", "myData2");
51+
$I->comment("Exiting Action Group FunctionalActionGroup (afterGroup)");
4852
}
4953

5054
/**
@@ -68,11 +72,13 @@ class ActionGroupWithDataTestCest
6872
public function ActionGroupWithDataTest(AcceptanceTester $I)
6973
{
7074
$I->amOnPage("/someUrl");
75+
$I->comment("Entering Action Group FunctionalActionGroupWithData (actionGroupWithData1)");
7176
$I->amOnPage("/Jane/Dane.html");
7277
$I->fillField("#foo", "Jane");
7378
$I->fillField("#bar", "Dane");
7479
$I->searchAndMultiSelectOption("#foo", ["Jane", "Dane"]);
7580
$I->see("#element .Jane");
81+
$I->comment("Exiting Action Group FunctionalActionGroupWithData (actionGroupWithData1)");
7682
$I->click("loginButton");
7783
}
7884
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
2929
*/
3030
public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I)
3131
{
32+
$I->comment("Entering Action Group actionGroupWithDefaultArgumentAndStringSelectorParam (actionGroup)");
3233
$I->see("John", "#element .test1");
34+
$I->comment("Exiting Action Group actionGroupWithDefaultArgumentAndStringSelectorParam (actionGroup)");
3335
}
3436
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
2929
*/
3030
public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I)
3131
{
32+
$I->comment("Entering Action Group actionGroupWithMultipleParameterSelectorsFromArgument (actionGroup)");
3233
$I->see("Doe", "#John-Doe .test");
34+
$I->comment("Exiting Action Group actionGroupWithMultipleParameterSelectorsFromArgument (actionGroup)");
3335
}
3436
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class ActionGroupWithNoArgumentsCest
2929
*/
3030
public function ActionGroupWithNoArguments(AcceptanceTester $I)
3131
{
32+
$I->comment("Entering Action Group actionGroupWithoutArguments (actionGroup)");
3233
$I->wait(1);
34+
$I->comment("Exiting Action Group actionGroupWithoutArguments (actionGroup)");
3335
}
3436
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ class ActionGroupWithNoDefaultTestCest
3333
[],
3434
null
3535
);
36+
$I->comment("Entering Action Group FunctionalActionGroup (beforeGroup)");
3637
$I->fillField("#foo", "myData1");
3738
$I->fillField("#bar", "myData2");
39+
$I->comment("Exiting Action Group FunctionalActionGroup (beforeGroup)");
3840
}
3941

4042
/**
@@ -43,8 +45,10 @@ class ActionGroupWithNoDefaultTestCest
4345
*/
4446
public function _after(AcceptanceTester $I)
4547
{
48+
$I->comment("Entering Action Group FunctionalActionGroup (afterGroup)");
4649
$I->fillField("#foo", "myData1");
4750
$I->fillField("#bar", "myData2");
51+
$I->comment("Exiting Action Group FunctionalActionGroup (afterGroup)");
4852
}
4953

5054
/**
@@ -68,9 +72,11 @@ class ActionGroupWithNoDefaultTestCest
6872
public function ActionGroupWithNoDefaultTest(AcceptanceTester $I)
6973
{
7074
$I->amOnPage("/someUrl");
75+
$I->comment("Entering Action Group FunctionalActionGroupNoDefault (actionGroupWithDataOverride1)");
7176
$I->fillField("#foo", "Jane");
7277
$I->fillField("#bar", "Dane");
7378
$I->see("#Jane .Dane");
79+
$I->comment("Exiting Action Group FunctionalActionGroupNoDefault (actionGroupWithDataOverride1)");
7480
$I->click("loginButton");
7581
}
7682
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class ActionGroupWithParameterizedElementWithHyphenCest
2727
*/
2828
public function ActionGroupWithParameterizedElementWithHyphen(AcceptanceTester $I)
2929
{
30+
$I->comment("Entering Action Group SectionArgumentWithParameterizedSelector (actionGroup)");
3031
$keyoneActionGroup = $I->executeJS("#element .full-width");
32+
$I->comment("Exiting Action Group SectionArgumentWithParameterizedSelector (actionGroup)");
3133
}
3234
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest
2929
*/
3030
public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I)
3131
{
32+
$I->comment("Entering Action Group actionGroupWithDefaultArgumentAndStringSelectorParam (actionGroup)");
3233
$I->see("John" . msq("UniquePerson"), "#element .test1");
34+
$I->comment("Exiting Action Group actionGroupWithDefaultArgumentAndStringSelectorParam (actionGroup)");
3335
}
3436
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ class ActionGroupWithPersistedDataCest
3333
[],
3434
null
3535
);
36+
$I->comment("Entering Action Group FunctionalActionGroup (beforeGroup)");
3637
$I->fillField("#foo", "myData1");
3738
$I->fillField("#bar", "myData2");
39+
$I->comment("Exiting Action Group FunctionalActionGroup (beforeGroup)");
3840
}
3941

4042
/**
@@ -43,8 +45,10 @@ class ActionGroupWithPersistedDataCest
4345
*/
4446
public function _after(AcceptanceTester $I)
4547
{
48+
$I->comment("Entering Action Group FunctionalActionGroup (afterGroup)");
4649
$I->fillField("#foo", "myData1");
4750
$I->fillField("#bar", "myData2");
51+
$I->comment("Exiting Action Group FunctionalActionGroup (afterGroup)");
4852
}
4953

5054
/**
@@ -75,10 +79,12 @@ class ActionGroupWithPersistedDataCest
7579
[],
7680
null
7781
);
82+
$I->comment("Entering Action Group FunctionalActionGroupWithData (actionGroupWithPersistedData1)");
7883
$I->amOnPage("/" . PersistedObjectHandler::getInstance()->retrieveEntityField('createPerson', 'firstname', 'test') . "/" . PersistedObjectHandler::getInstance()->retrieveEntityField('createPerson', 'lastname', 'test') . ".html");
7984
$I->fillField("#foo", PersistedObjectHandler::getInstance()->retrieveEntityField('createPerson', 'firstname', 'test'));
8085
$I->fillField("#bar", PersistedObjectHandler::getInstance()->retrieveEntityField('createPerson', 'lastname', 'test'));
8186
$I->searchAndMultiSelectOption("#foo", [PersistedObjectHandler::getInstance()->retrieveEntityField('createPerson', 'firstname', 'test'), PersistedObjectHandler::getInstance()->retrieveEntityField('createPerson', 'lastname', 'test')]);
8287
$I->see("#element ." . PersistedObjectHandler::getInstance()->retrieveEntityField('createPerson', 'firstname', 'test'));
88+
$I->comment("Exiting Action Group FunctionalActionGroupWithData (actionGroupWithPersistedData1)");
8389
}
8490
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ class ActionGroupWithSectionAndDataAsArgumentsCest
2727
*/
2828
public function ActionGroupWithSectionAndDataAsArguments(AcceptanceTester $I)
2929
{
30+
$I->comment("Entering Action Group actionGroupWithSectionAndData (actionGroup)");
3031
$I->waitForElementVisible("#element .John", 10);
32+
$I->comment("Exiting Action Group actionGroupWithSectionAndData (actionGroup)");
3133
}
3234
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class ActionGroupWithSimpleDataUsageFromDefaultArgumentCest
2929
*/
3030
public function ActionGroupWithSimpleDataUsageFromDefaultArgument(AcceptanceTester $I)
3131
{
32+
$I->comment("Entering Action Group actionGroupWithStringUsage (actionGroup)");
3233
$I->see("stringLiteral", "#element .stringLiteral");
34+
$I->comment("Exiting Action Group actionGroupWithStringUsage (actionGroup)");
3335
}
3436
}

0 commit comments

Comments
 (0)