Skip to content

Commit c76cecc

Browse files
author
Oleksandr Manchenko
committed
MTA-549: Re-factor Tests for Update Products
- Fixed logical and code style errors - Removed BAT, END_TO_END plans
1 parent 8fdc1fd commit c76cecc

File tree

22 files changed

+78
-193
lines changed

22 files changed

+78
-193
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ protected function getPreset($name)
544544
],
545545
],
546546

547-
'MAGETWO-12841' => [
547+
'two_options_with_fixed_and_percent_prices' => [
548548
'bundle_options' => [
549549
[
550550
'title' => 'BundleOption1',
@@ -582,7 +582,7 @@ protected function getPreset($name)
582582
],
583583
],
584584

585-
'MAGETWO-12842' => [
585+
'two_options_assigned_products_without_category' => [
586586
'bundle_options' => [
587587
[
588588
'title' => 'Drop-down Option',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,11 @@ public function getPreset()
186186
'price_to' => '756.00',
187187
'cart_price' => '756.00',
188188
],
189-
'MAGETWO-12841' => [
189+
'bundle_fixed_with_category' => [
190190
'price_from' => '130.00',
191191
'price_to' => '144.00',
192192
],
193-
'MAGETWO-12842' => [
193+
'bundle_dynamic_with_category' => [
194194
'price_from' => '100.00',
195195
'price_to' => '100.00',
196196
]

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Repository/BundleProduct.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</field>
133133
</dataset>
134134

135-
<dataset name="MAGETWO-12841">
135+
<dataset name="bundle_fixed_with_category">
136136
<field name="name" xsi:type="string">Bundle fixed product %isolation%</field>
137137
<field name="url_key" xsi:type="string">bundle-fixed-product-%isolation%</field>
138138
<field name="sku" xsi:type="string">sku_bundle_fixed_product_%isolation%</field>
@@ -153,19 +153,19 @@
153153
<item name="presets" xsi:type="string">default_subcategory</item>
154154
</field>
155155
<field name="bundle_selections" xsi:type="array">
156-
<item name="preset" xsi:type="string">MAGETWO-12841</item>
156+
<item name="preset" xsi:type="string">two_options_with_fixed_and_percent_prices</item>
157157
</field>
158158
</dataset>
159159

160-
<dataset name="MAGETWO-12842">
160+
<dataset name="bundle_dynamic_with_category">
161161
<field name="name" xsi:type="string">Bundle dynamic product %isolation%</field>
162162
<field name="url_key" xsi:type="string">bundle-dynamic-product-%isolation%</field>
163163
<field name="sku" xsi:type="string">sku_bundle_dynamic_product_%isolation%</field>
164164
<field name="sku_type" xsi:type="string">Dynamic</field>
165165
<field name="price_type" xsi:type="string">Dynamic</field>
166166
<field name="price" xsi:type="array">
167167
<item name="value" xsi:type="string">-</item>
168-
<item name="preset" xsi:type="string">MAGETWO-12842</item>
168+
<item name="preset" xsi:type="string">bundle_dynamic_with_category</item>
169169
</field>
170170
<field name="website_ids" xsi:type="array">
171171
<item name="0" xsi:type="string">Main Website</item>
@@ -174,7 +174,7 @@
174174
<item name="presets" xsi:type="string">default_subcategory</item>
175175
</field>
176176
<field name="bundle_selections" xsi:type="array">
177-
<item name="preset" xsi:type="string">MAGETWO-12842</item>
177+
<item name="preset" xsi:type="string">two_options_assigned_products_without_category</item>
178178
</field>
179179
</dataset>
180180
</storage>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ public function __inject(
7777
*/
7878
public function test(BundleProduct $product, BundleProduct $originalProduct)
7979
{
80+
// Preconditions
8081
$originalProduct->persist();
81-
$this->catalogProductIndex->open();
82+
$originalCategory = $originalProduct->hasData('category_ids')
83+
? $originalProduct->getDataFieldConfig('category_ids')['source']->getCategories()
84+
: null;
85+
$category = $product->hasData('category_ids')
86+
? $product->getDataFieldConfig('category_ids')['source']->getCategories()
87+
: $originalCategory;
88+
89+
// Steps
8290
$filter = ['sku' => $originalProduct->getSku()];
91+
92+
$this->catalogProductIndex->open();
8393
$this->catalogProductIndex->getProductGrid()->searchAndOpen($filter);
8494
$this->catalogProductEdit->getProductForm()->fill($product);
8595
$this->catalogProductEdit->getFormPageActions()->save();
8696

87-
$productWithCategory = null;
88-
if ($product->hasData('category_ids')) {
89-
$productWithCategory = $product;
90-
} elseif ($originalProduct->hasData('category_ids')) {
91-
$productWithCategory = $originalProduct;
92-
}
93-
if ($productWithCategory) {
94-
$categories = $productWithCategory->getDataFieldConfig('category_ids')['source']->getCategories();
95-
return ['category' => reset($categories)];
96-
}
97-
return [];
97+
return ['category' => $category];
9898
}
9999
}

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest/test.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
"description";"originalProduct/dataSet";"product/data/url_key";"product/data/name";"product/data/sku_type";"product/data/sku";"product/data/price/value";"product/data/price/preset";"product/data/weight_type";"product/data/weight";"product/data/category_ids/presets";"product/data/description";"product/data/bundle_shipment_type";"product/data/bundle_selections/preset";"product/data/checkout_data/preset";"product/data/visibility";"constraint";"tag"
2-
"Update dynamic bundle product";"bundle_dynamic_product";"bundle-product-%isolation%";"bundle_dynamic_%isolation%";"Fixed";"bundle_dynamic_%isolation%";"-";"dynamic-100";"Fixed";"1";"-";"Bundle Product Fixed Required";"Together";"default_dynamic";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertBundlePriceView, assertBundlePriceType";""
3-
"Update fixed bundle product";"bundle_fixed_product";"bundle-product-%isolation%";"bundle_fixed_%isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"fixed-756";"Dynamic";"-";"default_subcategory";"-";"Separately";"default_fixed";"default";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType";""
4-
"MAGETWO-12841: Edit Bundle Product (Fixed Price)";"MAGETWO-12841";"bundle-product-%isolation%";"bundle_fixed_%isolation%";"-";"bundle_sku_%isolation%";"120.00";"MAGETWO-12841";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleProductPage";"bamboo_plan:end_to_end"
5-
"MAGETWO-12842: Edit Bundle (dynamic) Product";"MAGETWO-12842";"bundle-product-%isolation%";"bundle_dynamic_%isolation%";"-";"bundle_sku_%isolation%";"-";"MAGETWO-12842";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleProductPage";"bamboo_plan:end_to_end"
1+
"description";"originalProduct/dataSet";"product/data/url_key";"product/data/name";"product/data/sku_type";"product/data/sku";"product/data/price/value";"product/data/price/preset";"product/data/weight_type";"product/data/weight";"product/data/category_ids/presets";"product/data/description";"product/data/bundle_shipment_type";"product/data/bundle_selections/preset";"product/data/checkout_data/preset";"product/data/visibility";"constraint"
2+
"Update dynamic bundle product";"bundle_dynamic_product";"bundle-product-%isolation%";"bundle_dynamic_%isolation%";"Fixed";"bundle_dynamic_%isolation%";"-";"dynamic-100";"Fixed";"1";"-";"Bundle Product Fixed Required";"Together";"default_dynamic";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertBundlePriceView, assertBundlePriceType"
3+
"Update fixed bundle product";"bundle_fixed_product";"bundle-product-%isolation%";"bundle_fixed_%isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"fixed-756";"Dynamic";"-";"default_subcategory";"-";"Separately";"default_fixed";"default";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage, assertBundleProductForm, assertBundleProductPage, assertProductInStock, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType"
4+
"MAGETWO-12841: Edit Bundle Product (Fixed Price)";"bundle_fixed_with_category";"bundle-product-%isolation%";"bundle_fixed_%isolation%";"-";"bundle_sku_%isolation%";"120.00";"bundle_fixed_with_category";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleProductPage"
5+
"MAGETWO-12842: Edit Bundle (dynamic) Product";"bundle_dynamic_with_category";"bundle-product-%isolation%";"bundle_dynamic_%isolation%";"-";"bundle_sku_%isolation%";"-";"bundle_dynamic_with_category";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleProductPage"

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -961,32 +961,5 @@
961961
<item name="preset" xsi:type="string">one_fpt_for_all_states</item>
962962
</field>
963963
</dataset>
964-
965-
<dataset name="MAGETWO-12428">
966-
<field name="name" xsi:type="string">Simple product MAGETWO-12428 %isolation%</field>
967-
<field name="url_key" xsi:type="string">simple-product-%isolation%</field>
968-
<field name="sku" xsi:type="string">simple_product_without_category_%isolation%</field>
969-
<field name="price" xsi:type="array">
970-
<item name="value" xsi:type="string">10</item>
971-
<item name="preset" xsi:type="string" />
972-
</field>
973-
<field name="tax_class_id" xsi:type="array">
974-
<item name="dataSet" xsi:type="string">taxable_goods</item>
975-
</field>
976-
<field name="quantity_and_stock_status" xsi:type="array">
977-
<item name="qty" xsi:type="string">1000</item>
978-
<item name="is_in_stock" xsi:type="string">In Stock</item>
979-
</field>
980-
<field name="weight" xsi:type="string">1</field>
981-
<field name="attribute_set_id" xsi:type="array">
982-
<item name="dataSet" xsi:type="string">default</item>
983-
</field>
984-
<field name="website_ids" xsi:type="array">
985-
<item name="0" xsi:type="string">Main Website</item>
986-
</field>
987-
<field name="category_ids" xsi:type="array">
988-
<item name="presets" xsi:type="string">default_subcategory</item>
989-
</field>
990-
</dataset>
991964
</storage>
992965
</repository>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest/test.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"Create anchor subcategory with all fields";"addSubcategory";"default_category";"Subcategory%isolation%";"Subcategory%isolation%";"Yes";"Anchor Subcategory All Fields";"Subcategory Page Title";"Yes";"Static block and products";"default";"Yes";"No";"Position";"Name";"Price";"No";"Price";"No";"50";"default";"catalogProductSimple::default,catalogProductSimple::default";"assertCategorySaveMessage, assertCategoryForm, assertCategoryPage, assertCategoryForAssignedProducts";""
77
"Create not active subcategory";"addSubcategory";"default_category";"Subcategory%isolation%";"Subcategory%isolation%";"Yes";"Not active category";"-";"Yes";"-";"-";"-";"Yes";"-";"-";"-";"Yes";"-";"Yes";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm";""
88
"Create not included in menu subcategory";"addSubcategory";"default_category";"Subcategory%isolation%";"Subcategory%isolation%";"Yes";"Not included in menu";"-";"No";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm";""
9-
"MAGETWO-12513: Create Category from Category page with Required Fields Only";"addSubcategory";"default_category";"Subcategory%isolation%";"-";"Yes";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm, assertCategoryPage";"bamboo_plan:BAT,test_type:acceptance_test"
10-
"MAGETWO-16351: Assign Products at the Category Level";"addSubcategory";"default_category";"Subcategory%isolation%";"-";"Yes";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"catalogProductSimple::default, configurableProductInjectable::default, bundleProduct::bundle_fixed_product";"assertCategorySaveMessage, assertCategoryForAssignedProducts";"bamboo_plan:end_to_end,test_type:acceptance_test"
9+
"MAGETWO-12513: Create Category from Category page with Required Fields Only";"addSubcategory";"default_category";"Subcategory%isolation%";"-";"Yes";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCategorySaveMessage, assertCategoryForm, assertCategoryPage";"test_type:acceptance_test"
10+
"MAGETWO-16351: Assign Products at the Category Level";"addSubcategory";"default_category";"Subcategory%isolation%";"-";"Yes";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"catalogProductSimple::default, configurableProductInjectable::default, bundleProduct::bundle_fixed_product";"assertCategorySaveMessage, assertCategoryForAssignedProducts";"test_type:acceptance_test"

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
/**
1414
* Class CreateTest
15-
* Create simple product for BAT
15+
* Create simple product
1616
*/
1717
class CreateTest extends Functional
1818
{

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

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,18 @@
66

77
namespace Magento\Catalog\Test\TestCase\Product;
88

9-
use Magento\Catalog\Test\Fixture\Category;
109
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
1110
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
1211
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
1312
use Magento\Mtf\ObjectManager;
1413
use Magento\Mtf\TestCase\Injectable;
1514

1615
/**
17-
* Test Creation for UpdateProductSimpleEntity
18-
*
1916
* Test Flow:
2017
*
2118
* Precondition:
22-
* Category is created.
23-
* Product is created and assigned to created category.
19+
* 1. Category is created.
20+
* 2. Product is created and assigned to created category.
2421
*
2522
* Steps:
2623
* 1. Login to backend.
@@ -72,36 +69,37 @@ public function __inject(
7269
/**
7370
* Run update product simple entity test
7471
*
75-
* @param string $initialProduct
72+
* @param CatalogProductSimple $initialProduct
7673
* @param CatalogProductSimple $product
7774
* @throws \Exception
7875
* @return array
7976
*/
80-
public function test($initialProduct, CatalogProductSimple $product)
77+
78+
79+
/**
80+
* @param CatalogProductSimple $initialProduct
81+
* @param CatalogProductSimple $product
82+
* @return array
83+
*/
84+
public function test(CatalogProductSimple $initialProduct, CatalogProductSimple $product)
8185
{
82-
$createProductsStep = ObjectManager::getInstance()->create(
83-
'Magento\Catalog\Test\TestStep\CreateProductStep',
84-
['product' => $initialProduct]
85-
);
86-
/** @var CatalogProductSimple $initialProduct */
87-
$initialProduct = $createProductsStep->run()['product'];
86+
// Preconditions
87+
$initialProduct->persist();
88+
$initialCategory = $initialProduct->hasData('category_ids')
89+
? $initialProduct->getDataFieldConfig('category_ids')['source']->getCategories()[0]
90+
: null;
91+
$category = $product->hasData('category_ids')
92+
? $product->getDataFieldConfig('category_ids')['source']->getCategories()[0]
93+
: $initialCategory;
94+
95+
// Steps
8896
$filter = ['sku' => $initialProduct->getSku()];
8997

90-
$this->productGrid->open()->getProductGrid()->searchAndOpen($filter);
98+
$this->productGrid->open();
99+
$this->productGrid->getProductGrid()->searchAndOpen($filter);
91100
$this->editProductPage->getProductForm()->fill($product);
92101
$this->editProductPage->getFormPageActions()->save();
93102

94-
$sharedArguments = ['initialProduct' => $initialProduct];
95-
$productWithCategory = null;
96-
if ($product->hasData('category_ids')) {
97-
$productWithCategory = $product;
98-
} elseif ($initialProduct->hasData('category_ids')) {
99-
$productWithCategory = $initialProduct;
100-
}
101-
if ($productWithCategory) {
102-
$categories = $productWithCategory->getDataFieldConfig('category_ids')['source']->getCategories();
103-
$sharedArguments['category'] = reset($categories);
104-
}
105-
return $sharedArguments;
103+
return ['category' => $category];
106104
}
107105
}

0 commit comments

Comments
 (0)