Skip to content

Commit 2f765b1

Browse files
author
Dmytro Aponasenko
committed
MTA-2726: Functional test maintenance. Part 3
1 parent 37b7b81 commit 2f765b1

File tree

10 files changed

+59
-15
lines changed

10 files changed

+59
-15
lines changed

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<data name="attribute/data/is_filterable_in_search" xsi:type="string">Yes</data>
4444
<data name="assertProduct/data/name" xsi:type="string">Product name</data>
4545
<data name="assertProduct/data/sku" xsi:type="string">product-sku</data>
46-
<data name="assertProduct/data/price" xsi:type="string">25</data>
4746
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterable" />
4847
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsFilterableInSearch" />
4948
<constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertProductAttributeIsConfigurable" />

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<data name="productAttribute/data/used_for_sort_by" xsi:type="string">Yes</data>
129129
<data name="assertProduct/data/name" xsi:type="string">Product name</data>
130130
<data name="assertProduct/data/sku" xsi:type="string">product-sku</data>
131-
<data name="assertProduct/data/price" xsi:type="string">25</data>
132131
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
133132
<constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
134133
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
</variation>
114114
<variation name="AdvancedSearchEntityTestVariation14">
115115
<data name="description" xsi:type="string">Negative product search</data>
116-
<data name="productSearch/data/name" xsi:type="string">TryToFindMeAndI&#39;llFindYOU</data>
116+
<data name="productSearch/data/name" xsi:type="string">Negative_product_search</data>
117117
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertAdvancedSearchNoResult" />
118118
</variation>
119119
</testCase>

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<dataset name="configurable_with_qty_1">
4242
<field name="name" xsi:type="string">Test configurable product %isolation%</field>
4343
<field name="sku" xsi:type="string">sku_test_configurable_product_%isolation%</field>
44+
<field name="price" xsi:type="array">
45+
<item name="dataset" xsi:type="string">price_40</item>
46+
</field>
4447
<field name="product_has_weight" xsi:type="string">Yes</field>
4548
<field name="weight" xsi:type="string">30</field>
4649
<field name="status" xsi:type="string">Product online</field>

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Repository/ConfigurableProduct/Price.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</dataset>
1313
<dataset name="price_40">
1414
<field name="category_price" xsi:type="string">40</field>
15+
<field name="compare_price" xsi:type="string">40</field>
1516
</dataset>
1617
<dataset name="MAGETWO-12620">
1718
<field name="category_price" xsi:type="string">11</field>

‎dev/tests/functional/tests/app/Magento/Sales/Test/Repository/ConfigData.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/Magento/Mtf/Repository/etc/repository.xsd">
9+
<repository class="Magento\Config\Test\Repository\ConfigData">
10+
<dataset name="checkmo_custom_new_order_status">
11+
<field name="payment/checkmo/order_status" xsi:type="array">
12+
<item name="scope" xsi:type="string">payment</item>
13+
<item name="scope_id" xsi:type="number">1</item>
14+
<item name="label" xsi:type="string">custom</item>
15+
<item name="value" xsi:type="string">custom</item>
16+
</field>
17+
</dataset>
18+
19+
<dataset name="checkmo_custom_new_order_status_rollback">
20+
<field name="payment/checkmo/order_status" xsi:type="array">
21+
<item name="scope" xsi:type="string">payment</item>
22+
<item name="scope_id" xsi:type="number">1</item>
23+
<item name="label" xsi:type="string">Pending</item>
24+
<item name="value" xsi:type="string">Pending</item>
25+
</field>
26+
</dataset>
27+
</repository>
28+
</config>

‎dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,18 @@ public function test(
141141
$this->orderStatusAssign->getPageActionsBlock()->save();
142142
$assertion->processAssert($this->orderStatusIndex);
143143

144+
// Prepare data for constraints
145+
$config = $this->fixtureFactory->createByCode('configData', [
146+
'dataset' => 'checkmo_custom_new_order_status',
147+
'data' => ['payment/checkmo/order_status' => ['value' => $orderStatus->getStatus()]]
148+
]);
149+
$config->persist();
144150
$order->persist();
145151
$this->order = $order;
152+
$this->fixtureFactory->createByCode(
153+
'configData',
154+
['dataset' => 'checkmo_custom_new_order_status', 'data' => ['value' => $orderStatus->getLabel()]]
155+
);
146156

147157
return [
148158
'orderId' => $order->getId(),
@@ -152,7 +162,7 @@ public function test(
152162
}
153163

154164
/**
155-
* Change created order status and unassign custom order status
165+
* Change created order status and unassign custom order status.
156166
*
157167
* @return void
158168
*/
@@ -165,6 +175,10 @@ public function tearDown()
165175
$filter = ['label' => $this->orderStatus->getLabel()];
166176
$this->orderStatusIndex->open()->getOrderStatusGrid()->searchAndUnassign($filter);
167177
$this->orderStatusIndex->getMessagesBlock()->waitSuccessMessage();
178+
$this->objectManager->create(
179+
'Magento\Config\Test\TestStep\SetupConfigurationStep',
180+
['configData' => 'checkmo_custom_new_order_status_rollback']
181+
)->run();
168182
}
169183
}
170184
}

‎dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.xml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,14 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Sales\Test\TestCase\AssignCustomOrderStatusTest" summary="Assign Custom Order Status" ticketId="MAGETWO-29382">
1010
<variation name="AssignCustomOrderStatusTestVariation1">
11-
<data name="orderStatusState/state" xsi:type="string">Pending</data>
12-
<data name="orderStatusState/is_default" xsi:type="string">No</data>
13-
<data name="orderStatusState/visible_on_front" xsi:type="string">Yes</data>
14-
<data name="statusToCheck" xsi:type="string">Pending</data>
15-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusInGrid" />
16-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
17-
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGridOnFrontend" />
18-
</variation>
19-
<variation name="AssignCustomOrderStatusTestVariation2">
2011
<data name="orderStatusState/state" xsi:type="string">Pending</data>
2112
<data name="orderStatusState/is_default" xsi:type="string">Yes</data>
2213
<data name="orderStatusState/visible_on_front" xsi:type="string">No</data>
2314
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusInGrid" />
2415
<constraint name="Magento\Sales\Test\Constraint\AssertOrderStatusIsCorrect" />
2516
<constraint name="Magento\Sales\Test\Constraint\AssertOrderNotVisibleOnMyAccount" />
2617
</variation>
27-
<variation name="AssignCustomOrderStatusTestVariation3">
18+
<variation name="AssignCustomOrderStatusTestVariation2">
2819
<data name="orderStatusState/state" xsi:type="string">Pending</data>
2920
<data name="orderStatusState/is_default" xsi:type="string">Yes</data>
3021
<data name="orderStatusState/visible_on_front" xsi:type="string">Yes</data>

‎dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/UpdateCustomOrderStatusTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ public function test(
117117
// Preconditions:
118118
$orderStatusInitial->persist();
119119
if ($orderExist == 'Yes') {
120+
$config = $fixtureFactory->createByCode('configData', [
121+
'dataset' => 'checkmo_custom_new_order_status',
122+
'data' => ['payment/checkmo/order_status' => ['value' => $orderStatusInitial->getStatus()]]
123+
]);
124+
$config->persist();
120125
$order->persist();
121126
}
122127
// Steps:
@@ -154,6 +159,10 @@ public function tearDown()
154159
$this->orderIndex->open()->getSalesOrderGrid()->massaction([['id' => $this->order->getId()]], 'Cancel');
155160
$filter = ['label' => $this->orderStatus->getLabel(), 'status' => $this->orderStatusInitial->getStatus()];
156161
$this->orderStatusIndex->open()->getOrderStatusGrid()->searchAndUnassign($filter);
162+
$this->objectManager->create(
163+
'Magento\Config\Test\TestStep\SetupConfigurationStep',
164+
['configData' => 'checkmo_custom_new_order_status_rollback']
165+
)->run();
157166
}
158167
}
159168
}

‎dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/UpdateSalesRuleEntityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<testCase name="Magento\SalesRule\Test\TestCase\UpdateSalesRuleEntityTest" summary="Update Cart Price Rule" ticketId="MAGETWO-24860">
1010
<variation name="UpdateSalesRuleEntityTestVariation1">
1111
<data name="salesRuleOrigin/dataset" xsi:type="string">active_sales_rule_with_complex_conditions</data>
12-
<data name="salesRule/data/conditions_serialized" xsi:type="string">{Conditions combination:[[Shipping Method|is|\[flatrate\] Fixed][Shipping Postcode|is|95814][Shipping State/Province|is|California][Shipping Country|is|United States]]}</data>
12+
<data name="salesRule/data/conditions_serialized" xsi:type="string">[Subtotal|is|400]</data>
1313
<data name="salesRule/data/simple_action" xsi:type="string">Buy X get Y free (discount amount is Y)</data>
1414
<data name="salesRule/data/discount_amount" xsi:type="string">1</data>
1515
<data name="salesRule/data/discount_step" xsi:type="string">3</data>

0 commit comments

Comments
 (0)