Skip to content

Commit 639a332

Browse files
author
Michael Logvin
committed
MAGETWO-33053: MTF Configuration pull request
1 parent 2b80756 commit 639a332

File tree

5 files changed

+7
-1
lines changed

5 files changed

+7
-1
lines changed

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/TaxClass.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data
8989
protected function setTaxClassId($taxClassName)
9090
{
9191
$url = $_ENV['app_backend_url'] . 'tax/rule/new/';
92-
$curl = new BackendDecorator(new CurlTransport(), $this->_configuration);
92+
$config = \Magento\Mtf\ObjectManagerFactory::getObjectManager()->create('Magento\Mtf\Config');
93+
$curl = new BackendDecorator(new CurlTransport(), $config);
9394
$curl->addOption(CURLOPT_HEADER, 1);
9495
$curl->write(CurlInterface::POST, $url, '1.0', [], []);
9596
$response = $curl->read();

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
<data name="product/data/short_description">Simple Product short_description %isolation%</data>
228228
<data name="product/data/description">Simple Product description %isolation%</data>
229229
<data name="product/data/weight">60</data>
230+
<data name="product/data/quantity_and_stock_status/qty">0</data>
230231
<data name="product/data/quantity_and_stock_status/is_in_stock">Out of Stock</data>
231232
<data name="product/data/visibility">-</data>
232233
<data name="product/data/custom_options/preset">-</data>

dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteAdminUserEntityTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/global/variations.xsd">
99
<testCase name="DeleteAdminUserEntityTest">
1010
<variation name="DeleteAdminUserEntityTestVariation1">
11+
<data name="isDefaultUser">0</data>
1112
<data name="constraint">assertImpossibleDeleteYourOwnAccount, assertUserInGrid</data>
1213
</variation>
1314
<variation name="DeleteAdminUserEntityTestVariation2">

dev/tests/functional/tests/app/Magento/User/Test/TestCase/DeleteUserRoleEntityTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../etc/global/variations.xsd">
99
<testCase name="DeleteUserRoleEntityTest">
1010
<variation name="DeleteUserRoleEntityTestVariation1">
11+
<data name="isDefaultUser">0</data>
1112
<data name="constraint">assertImpossibleDeleteYourOwnRole, assertRoleInGrid</data>
1213
</variation>
1314
<variation name="DeleteUserRoleEntityTestVariation2">

dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<data name="user/data/password_confirmation">123123qa</data>
1818
<data name="user/data/is_active">-</data>
1919
<data name="user/data/role_id/dataSet">-</data>
20+
<data name="loginAsDefaultAdmin">0</data>
2021
<data name="constraint">assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin</data>
2122
<data name="user/data/current_password">123123q</data>
2223
</variation>
@@ -30,6 +31,7 @@
3031
<data name="user/data/password_confirmation">-</data>
3132
<data name="user/data/is_active">-</data>
3233
<data name="user/data/role_id/dataSet">role_sales</data>
34+
<data name="loginAsDefaultAdmin">0</data>
3335
<data name="constraint">assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin, assertUserRoleSalesRestrictedAccess</data>
3436
<data name="user/data/current_password">123123q</data>
3537
</variation>

0 commit comments

Comments
 (0)