Skip to content

Commit 8243252

Browse files
author
Joan He
committed
MAGETWO-90719：Exception is thrown when you re-order a product with custom options from Admin
- resolve merge conflict
2 parents abc68c5 + 11ade1f commit 8243252

File tree

7 files changed

+50
-37
lines changed

7 files changed

+50
-37
lines changed

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</actionGroup>
1818

1919
<!--Create new user with specified role-->
20-
<actionGroup name="AdminCreateUser">
20+
<actionGroup name="AdminCreateUserAction">
2121
<click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
2222
<waitForPageLoad stepKey="waitForNewUserPageLoad" time="10"/>
2323
<fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{NewAdmin.username}}" stepKey="enterUserName" />
@@ -53,4 +53,4 @@
5353
<see userInput="You deleted the user." stepKey="seeSuccessMessage" />
5454
</actionGroup>
5555

56-
</actionGroups>
56+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="CreateAnAdminOrderUsingBraintreePaymentTest1">
1212
<annotations>
1313
<features value="Backend"/>
@@ -17,6 +17,9 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-93677"/>
1919
<group value="braintree"/>
20+
<skip>
21+
<issueId value="MQE-1187" />
22+
</skip>
2023
</annotations>
2124

2225

@@ -42,7 +45,7 @@
4245

4346
<!--Create New User With Specific Role-->
4447
<actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
45-
<actionGroup ref="AdminCreateUser" stepKey="AdminCreateNewUser"/>
48+
<actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
4649

4750
<!--SignOut-->
4851
<actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="StorefrontCustomerCheckoutTest">
1212
<annotations>
1313
<features value="Checkout"/>
@@ -88,6 +88,9 @@
8888
<title value="Customer Checkout with multiple addresses and tax rates"/>
8989
<description value="Should be able to place an order as a customer with multiple addresses and tax rates."/>
9090
<testCaseId value="MAGETWO-93109"/>
91+
<skip>
92+
<issueId value="MQE-1187" />
93+
</skip>
9194
</annotations>
9295
<before>
9396
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<description value="Admin should be able to add image to WYSIWYG content of Block"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-84376"/>
19+
<skip>
20+
<issueId value="MQE-1187" />
21+
</skip>
1922
</annotations>
2023
<before>
2124
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"zendframework/zend-view": "~2.10.0"
8282
},
8383
"require-dev": {
84-
"magento/magento2-functional-testing-framework": "2.3.3",
84+
"magento/magento2-functional-testing-framework": "2.3.4",
8585
"friendsofphp/php-cs-fixer": "~2.12.0",
8686
"lusitanian/oauth": "~0.8.10",
8787
"pdepend/pdepend": "2.5.2",

‎composer.lock

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/acceptance/RoboFile.php

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function buildProject()
3131
*
3232
* @param array $tests
3333
* @param array $opts
34-
* @return void
34+
* @return \Robo\Result
3535
*/
3636
function generateTests(array $tests, $opts = [
3737
'config' => null,
@@ -56,36 +56,36 @@ function generateTests(array $tests, $opts = [
5656
$baseCmd .= ' --force';
5757
}
5858

59-
$this->taskExec($baseCmd)->args($tests)->run();
59+
return $this->taskExec($baseCmd)->args($tests)->run();
6060
}
6161

6262
/**
6363
* Generate a suite based on name(s) passed in as args.
6464
*
6565
* @param array $args
6666
* @throws Exception
67-
* @return void
67+
* @return \Robo\Result
6868
*/
6969
function generateSuite(array $args)
7070
{
7171
if (empty($args)) {
7272
throw new Exception("Please provide suite name(s) after generate:suite command");
7373
}
7474
$baseCmd = $this->getBaseCmd("generate:suite");
75-
$this->taskExec($baseCmd)->args($args)->run();
75+
return $this->taskExec($baseCmd)->args($args)->run();
7676
}
7777

7878
/**
7979
* Run all Tests with the specified @group tag'.
8080
*
8181
* @param array $args
82-
* @return void
82+
* @return \Robo\Result
8383
*/
8484
function group(array $args)
8585
{
8686
$args = array_merge($args, ['-k']);
8787
$baseCmd = $this->getBaseCmd("run:group");
88-
$this->taskExec($baseCmd)->args($args)->run();
88+
return $this->taskExec($baseCmd)->args($args)->run();
8989
}
9090

9191
/**
@@ -111,48 +111,52 @@ function allure2Generate()
111111
/**
112112
* Open the HTML Allure report - Allure v1.4.X
113113
*
114-
* @return void
114+
* @return \Robo\Result
115115
*/
116116
function allure1Open()
117117
{
118-
$this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
118+
return $this->_exec('allure report open --report-dir tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
119119
}
120120

121121
/**
122122
* Open the HTML Allure report - Allure v2.3.X
123123
*
124-
* @return void
124+
* @return \Robo\Result
125125
*/
126126
function allure2Open()
127127
{
128-
$this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
128+
return $this->_exec('allure open --port 0 tests'. DIRECTORY_SEPARATOR .'_output'. DIRECTORY_SEPARATOR .'allure-report'. DIRECTORY_SEPARATOR .'');
129129
}
130130

131131
/**
132132
* Generate and open the HTML Allure report - Allure v1.4.X
133133
*
134-
* @return void
134+
* @return \Robo\Result
135135
*/
136136
function allure1Report()
137137
{
138138
$result1 = $this->allure1Generate();
139139

140140
if ($result1->wasSuccessful()) {
141-
$this->allure1Open();
141+
return $this->allure1Open();
142+
} else {
143+
return $result1;
142144
}
143145
}
144146

145147
/**
146148
* Generate and open the HTML Allure report - Allure v2.3.X
147149
*
148-
* @return void
150+
* @return \Robo\Result
149151
*/
150152
function allure2Report()
151153
{
152154
$result1 = $this->allure2Generate();
153155

154156
if ($result1->wasSuccessful()) {
155-
$this->allure2Open();
157+
return $this->allure2Open();
158+
} else {
159+
return $result1;
156160
}
157161
}
158162

@@ -168,4 +172,4 @@ private function getBaseCmd($command)
168172
chdir(__DIR__);
169173
return realpath('../../../vendor/bin/mftf') . " $command";
170174
}
171-
}
175+
}

0 commit comments

Comments
 (0)