Skip to content

Commit faeee49

Browse files
jilu1jilu1
committed
Merge branch 'MQE-541' into MQE-574
2 parents 62780b4 + 110c3a5 commit faeee49

Some content is hidden

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

41 files changed

+741
-759
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ActionObjectTest extends TestCase
2727
*/
2828
public function testConstructOrderBefore()
2929
{
30-
$actionObject = new ActionObject('mergeKey', 'type', [], null, 'before');
30+
$actionObject = new ActionObject('stepKey', 'type', [], null, 'before');
3131
$this->assertEquals(0, $actionObject->getOrderOffset());
3232
}
3333

@@ -36,7 +36,7 @@ public function testConstructOrderBefore()
3636
*/
3737
public function testConstructOrderAfter()
3838
{
39-
$actionObject = new ActionObject('mergeKey', 'type', [], null, 'after');
39+
$actionObject = new ActionObject('stepKey', 'type', [], null, 'after');
4040
$this->assertEquals(1, $actionObject->getOrderOffset());
4141
}
4242

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,39 +49,39 @@ public function testResolveActionStepOrdering()
4949
$testObjNamePosAfterEnd = 'testAfterAfterMerge10';
5050

5151
for ($i = 1; $i < $actionsLength; $i++) {
52-
$mergeKey = 'mergeKey'. $i;
52+
$stepKey = 'stepKey'. $i;
5353
$type = 'testType';
5454
$actionAttributes = [];
5555

56-
$actions[] = new ActionObject($mergeKey, $type, $actionAttributes);
56+
$actions[] = new ActionObject($stepKey, $type, $actionAttributes);
5757
}
5858

5959
$actions[] = new ActionObject(
6060
$testObjNamePosAfterEnd,
61-
'mergeType',
61+
'stepType',
6262
[],
6363
$testObjNamePosEnd,
6464
ActionObject::MERGE_ACTION_ORDER_AFTER
6565
);
6666
$actions[] = new ActionObject(
6767
$testObjNamePosBeforeFirst,
68-
'mergeType',
68+
'stepType',
6969
[],
7070
$testObjNamePosFirst,
7171
ActionObjectExtractor::TEST_ACTION_BEFORE
7272
);
7373
$actions[] = new ActionObject(
7474
$testObjNamePosFirst,
75-
'mergeType',
75+
'stepType',
7676
[],
77-
'mergeKey1',
77+
'stepKey1',
7878
ActionObjectExtractor::TEST_ACTION_BEFORE
7979
);
8080
$actions[] = new ActionObject(
8181
$testObjNamePosEnd,
82-
'mergeType',
82+
'stepType',
8383
[],
84-
'mergeKey' . (string)($actionsLength - 1),
84+
'stepKey' . (string)($actionsLength - 1),
8585
ActionObject::MERGE_ACTION_ORDER_AFTER
8686
);
8787

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ActionGroupFunctionalCest
3131

3232
public function _before(AcceptanceTester $I)
3333
{
34-
$I->amGoingTo("create entity that has the mergeKey: createPersonParam");
34+
$I->amGoingTo("create entity that has the stepKey: createPersonParam");
3535
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3636
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson);
3737
$this->createPersonParam->createEntity();
@@ -111,7 +111,7 @@ class ActionGroupFunctionalCest
111111
*/
112112
public function ActionGroupWithPersistedData(AcceptanceTester $I)
113113
{
114-
$I->amGoingTo("create entity that has the mergeKey: createPerson");
114+
$I->amGoingTo("create entity that has the stepKey: createPerson");
115115
$DefaultPerson = DataObjectHandler::getInstance()->getObject("DefaultPerson");
116116
$createPerson = new DataPersistenceHandler($DefaultPerson);
117117
$createPerson->createEntity();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AssertCest
2626

2727
public function _before(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: createData1");
29+
$I->amGoingTo("create entity that has the stepKey: createData1");
3030
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3131
$this->createData1 = new DataPersistenceHandler($ReplacementPerson);
3232
$this->createData1->createEntity();
@@ -39,7 +39,7 @@ class AssertCest
3939
*/
4040
public function AssertTest(AcceptanceTester $I)
4141
{
42-
$I->amGoingTo("create entity that has the mergeKey: createData2");
42+
$I->amGoingTo("create entity that has the stepKey: createData2");
4343
$UniquePerson = DataObjectHandler::getInstance()->getObject("UniquePerson");
4444
$createData2 = new DataPersistenceHandler($UniquePerson);
4545
$createData2->createEntity();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class LocatorFunctionCest
2626
*/
2727
public function LocatorFuctionTest(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: data");
29+
$I->amGoingTo("create entity that has the stepKey: data");
3030
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3131
$data = new DataPersistenceHandler($ReplacementPerson);
3232
$data->createEntity();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ class MergeFunctionalCest
5454
$I->fillField("#bar", "Dane");
5555
$I->searchAndMultiSelectOption("#foo", ["Jane", "Dane"]);
5656
$I->see("#element .Jane");
57+
$I->click("#step10MergedInResult");
58+
$I->click("#step11MergedInResult");
59+
$I->click("#step12MergedInResult");
5760
}
5861

5962
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PageReplacementCest
2626
*/
2727
public function PageReplacementTest(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: datakey");
29+
$I->amGoingTo("create entity that has the stepKey: datakey");
3030
$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
3131
$datakey = new DataPersistenceHandler($simpleData);
3232
$datakey->createEntity();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ParameterArrayCest
2626
*/
2727
public function ParameterArrayTest(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: simpleDataKey");
29+
$I->amGoingTo("create entity that has the stepKey: simpleDataKey");
3030
$simpleParamData = DataObjectHandler::getInstance()->getObject("simpleParamData");
3131
$simpleDataKey = new DataPersistenceHandler($simpleParamData);
3232
$simpleDataKey->createEntity();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PersistedReplacementCest
2626

2727
public function _before(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: createData1");
29+
$I->amGoingTo("create entity that has the stepKey: createData1");
3030
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3131
$this->createData1 = new DataPersistenceHandler($ReplacementPerson);
3232
$this->createData1->createEntity();
@@ -39,7 +39,7 @@ class PersistedReplacementCest
3939
*/
4040
public function PersistedReplacementTest(AcceptanceTester $I)
4141
{
42-
$I->amGoingTo("create entity that has the mergeKey: createdData");
42+
$I->amGoingTo("create entity that has the stepKey: createdData");
4343
$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
4444
$createdData = new DataPersistenceHandler($simpleData);
4545
$createdData->createEntity();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SectionReplacementCest
4545
$I->click("#Doe".msq("uniqueData")." .stringLiteral2");
4646
$I->click("#Doe".msq("uniqueData")."-stringLiteral2 .stringLiteral3");
4747
$I->click("#Doe".msq("uniqueData")."-stringLiteral2 .Doe");
48-
$I->amGoingTo("create entity that has the mergeKey: createdData");
48+
$I->amGoingTo("create entity that has the stepKey: createdData");
4949
$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
5050
$createdData = new DataPersistenceHandler($simpleData);
5151
$createdData->createEntity();

0 commit comments

Comments
 (0)