Skip to content

Commit 4a8238e

Browse files
author
Dmytro Aponasenko
committed
MTA-1602: Sync qmt repository with mainline - Sprint 6
1 parent 63ccbbf commit 4a8238e

File tree

6 files changed

+53
-43
lines changed

6 files changed

+53
-43
lines changed

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/BundleSelections.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,7 @@ protected function getPreset($name)
587587
[
588588
'title' => 'Drop-down Option',
589589
'type' => 'Drop-down',
590+
'required' => 'Yes',
590591
'assigned_products' => [
591592
[
592593
'search_data' => [
@@ -620,6 +621,7 @@ protected function getPreset($name)
620621
[
621622
'title' => 'Drop-down Option',
622623
'type' => 'Drop-down',
624+
'required' => 'Yes',
623625
'assigned_products' => [
624626
[
625627
'search_data' => [

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -118,38 +118,25 @@ public function getPreset()
118118
'price_to' => '80.00',
119119
'cart_price' => '80.00',
120120
],
121-
'dynamic-200' => [
122-
'price_from' => '200.00',
123-
'price_to' => '500.00',
124-
'cart_price' => '400.00',
125-
],
126-
'fixed-24' => [
127-
'price_from' => '96.00',
128-
'price_to' => '97.00',
129-
'cart_price' => '244.00',
130-
],
121+
// Bundle fixed
131122
'fixed-1' => [
132123
'price_from' => '1.00',
133124
'price_to' => '10.00',
134125
'cart_price' => '80.00',
135126
],
136-
'dynamic-8' => [
137-
'price_from' => '8.00',
138-
'price_to' => '20.00',
139-
'cart_price' => '80.00',
140-
],
141-
'dynamic-32' => [
142-
'price_from' => '32.00',
143-
'price_to' => '80.00',
127+
'fixed-15' => [
128+
'price_from' => '15.00',
129+
'price_to' => '16.00',
144130
'cart_price' => '80.00',
145131
],
146-
'dynamic-40' => [
147-
'price_from' => '40.00',
148-
'price_to' => '100.00',
149-
'cart_price' => '100.00',
132+
'fixed-24' => [
133+
'price_from' => '96.00',
134+
'price_to' => '97.00',
135+
'cart_price' => '244.00',
150136
],
151-
'dynamic-50' => [
152-
'price_from' => '50.00',
137+
'fixed-100' => [
138+
'price_from' => '110.00',
139+
'price_to' => '120.00',
153140
],
154141
'fixed-115' => [
155142
'price_from' => '115.00',
@@ -161,36 +148,58 @@ public function getPreset()
161148
'price_to' => '120.00',
162149
'cart_price' => '159.00',
163150
],
164-
'fixed-15' => [
165-
'price_from' => '15.00',
166-
'price_to' => '16.00',
167-
'cart_price' => '80.00',
151+
'fixed-756' => [
152+
'price_from' => '755.00',
153+
'price_to' => '756.00',
154+
'cart_price' => '756.00',
168155
],
169156
'default_fixed' => [
170157
'compare_price' => [
171158
'price_from' => '755.00',
172159
'price_to' => '756.00',
173160
],
174161
],
162+
'bundle_fixed_with_category' => [
163+
'price_from' => '130.00',
164+
'price_to' => '144.00',
165+
],
166+
// Bundle dynamic
175167
'default_dynamic' => [
176168
'compare_price' => [
177169
'price_from' => '100.00',
178170
'price_to' => '560.00',
179171
],
180172
],
173+
'dynamic-8' => [
174+
'price_from' => '8.00',
175+
'price_to' => '20.00',
176+
'cart_price' => '80.00',
177+
],
178+
'dynamic-32' => [
179+
'price_from' => '32.00',
180+
'price_to' => '80.00',
181+
'cart_price' => '80.00',
182+
],
183+
'dynamic-40' => [
184+
'price_from' => '40.00',
185+
'price_to' => '100.00',
186+
'cart_price' => '100.00',
187+
],
188+
'dynamic-50' => [
189+
'price_from' => '50.00',
190+
],
181191
'dynamic-100' => [
182192
'price_from' => '100.00',
183193
'price_to' => '560.00',
184194
'cart_price' => '100.00',
185195
],
186-
'fixed-756' => [
187-
'price_from' => '755.00',
188-
'price_to' => '756.00',
189-
'cart_price' => '756.00',
196+
'dynamic-200' => [
197+
'price_from' => '200.00',
198+
'price_to' => '500.00',
199+
'cart_price' => '400.00',
190200
],
191-
'bundle_fixed_with_category' => [
192-
'price_from' => '130.00',
193-
'price_to' => '144.00',
201+
'dynamic-560' => [
202+
'price_from' => '560.00',
194203
],
195204
'bundle_dynamic_with_category' => [
196205
'price_from' => '100.00',

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
use Magento\Mtf\TestCase\Injectable;
1414

1515
/**
16-
* Test Creation for CreateBundleProductEntity
17-
*
1816
* Test Flow:
1917
* 1. Login as admin
2018
* 2. Navigate to the Products>Inventory>Catalog

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<data name="product/data/visibility">Catalog, Search</data>
7676
<data name="product/data/use_config_gift_message_available">No</data>
7777
<data name="product/data/gift_message_available">Yes</data>
78-
<data name="constraint">assertProductSaveMessage, assertProductNotSearchableBySku</data>
78+
<data name="constraint">assertProductSaveMessage, assertProductNotSearchableBySku</data>
7979
</variation>
8080
<variation name="CreateBundleProductEntityTestVariation3">
8181
<data name="description">Create dynamic bundle with price randle and all types options</data>
@@ -506,7 +506,7 @@
506506
<data name="product/data/status">-</data>
507507
<data name="product/data/price_type">Fixed</data>
508508
<data name="product/data/price/value">100</data>
509-
<data name="product/data/price/preset">-</data>
509+
<data name="product/data/price/preset">fixed-100</data>
510510
<data name="product/data/tax_class_id/dataSet">taxable_goods</data>
511511
<data name="product/data/quantity_and_stock_status/is_in_stock">-</data>
512512
<data name="product/data/weight_type">Fixed</data>
@@ -530,7 +530,7 @@
530530
<data name="product/data/visibility">-</data>
531531
<data name="product/data/use_config_gift_message_available">-</data>
532532
<data name="product/data/gift_message_available">-</data>
533-
<data name="constraint">assertProductSaveMessage, assertBundleInGrid, assertBundleInCategory, assertBundleProductPage</data>
533+
<data name="constraint">assertProductSaveMessage, assertProductInGrid, assertBundleInCategory, assertBundleProductPage</data>
534534
<data name="tag">test_type:acceptance_test</data>
535535
</variation>
536536
<variation name="CreateBundleProductEntityTestVariation16">
@@ -542,7 +542,7 @@
542542
<data name="product/data/status">-</data>
543543
<data name="product/data/price_type">Dynamic</data>
544544
<data name="product/data/price/value">-</data>
545-
<data name="product/data/price/preset">-</data>
545+
<data name="product/data/price/preset">dynamic-560</data>
546546
<data name="product/data/tax_class_id/dataSet">-</data>
547547
<data name="product/data/quantity_and_stock_status/is_in_stock">-</data>
548548
<data name="product/data/weight_type">-</data>
@@ -566,7 +566,7 @@
566566
<data name="product/data/visibility">-</data>
567567
<data name="product/data/use_config_gift_message_available">-</data>
568568
<data name="product/data/gift_message_available">-</data>
569-
<data name="constraint">assertProductSaveMessage, assertBundleInGrid, assertBundleInCategory, assertBundleProductPage</data>
569+
<data name="constraint">assertProductSaveMessage, assertProductInGrid, assertBundleInCategory, assertBundleProductPage</data>
570570
<data name="tag">test_type:acceptance_test</data>
571571
</variation>
572572
</testCase>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct(
5757
} elseif (isset($data['presets'])) {
5858
$presets = explode(',', $data['presets']);
5959
foreach ($presets as $preset) {
60-
if ($preset == "") {
60+
if (trim($preset) == '-') {
6161
$this->data[] = '';
6262
continue;
6363
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
<variation name="UpdateSimpleProductEntityTestVariation9">
131131
<data name="description">MAGETWO-12417: Unassign Products from the Category</data>
132132
<data name="initialProduct/dataSet">product_with_category</data>
133+
<data name="product/data/category_ids/presets"> -</data>
133134
<data name="product/data/name">-</data>
134135
<data name="product/data/sku">-</data>
135136
<data name="product/data/price/value">-</data>

0 commit comments

Comments
 (0)