Skip to content

Commit 59b8c91

Browse files
kandykandy
committed
Merge branch 'BugFestW4' of github.corp.magento.com:magento-dragons/magento2ce into BugFestW4
2 parents ccdc45d + 74296a2 commit 59b8c91

File tree

13 files changed

+45
-22
lines changed

13 files changed

+45
-22
lines changed

‎dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ public function testCreateConfigurableProduct()
126126

127127
$response = $this->createConfigurableProduct();
128128
$this->assertEquals(self::CONFIGURABLE_PRODUCT_SKU, $response[ProductInterface::SKU]);
129-
$this->assertEquals(50, $response['price']);
130129
$this->assertTrue(
131130
isset($response[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]["configurable_product_options"])
132131
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
</dataset>
5757

5858
<dataset name="fixed-100-custom-options">
59-
<field name="price_from" xsi:type="string">244.00</field>
60-
<field name="cart_price" xsi:type="string">244.00</field>
59+
<field name="price_from" xsi:type="string">270.00</field>
60+
<field name="cart_price" xsi:type="string">270.00</field>
6161
</dataset>
6262

6363
<dataset name="fixed-110">

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@
149149
<data name="product/data/weight" xsi:type="string">10</data>
150150
<data name="product/data/category" xsi:type="string">category_%isolation%</data>
151151
<data name="product/data/price_view" xsi:type="string">Price Range</data>
152-
<data name="product/data/stock_data/use_config_manage_stock" xsi:type="string">No</data>
153-
<data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
154152
<data name="product/data/shipment_type" xsi:type="string">Together</data>
155153
<data name="product/data/bundle_selections/dataset" xsi:type="string">with_not_required_options</data>
156154
<data name="product/data/bundle_selections/products" xsi:type="string">catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar|catalogProductSimple::product_100_dollar,catalogProductVirtual::product_50_dollar</data>
@@ -214,7 +212,7 @@
214212
<data name="product/data/sku_type" xsi:type="string">Dynamic</data>
215213
<data name="product/data/sku" xsi:type="string">sku_bundle_dynamic_%isolation%</data>
216214
<data name="product/data/price_type" xsi:type="string">Dynamic</data>
217-
<data name="product/data/price/dataset" xsi:type="string">dynamic-32</data>
215+
<data name="product/data/price/dataset" xsi:type="string">dynamic-40</data>
218216
<data name="product/data/bundle_selections/dataset" xsi:type="string">default_dynamic</data>
219217
<data name="product/data/bundle_selections/products" xsi:type="string">catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar</data>
220218
<data name="product/data/checkout_data/dataset" xsi:type="string">bundle_default</data>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,6 @@
441441
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
442442
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
443443
<data name="product/data/price/value" xsi:type="string">10</data>
444-
<data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
445444
<data name="product/data/stock_data/qty" xsi:type="string">1</data>
446445
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
447446
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,21 @@ class Config extends Tab
6060
*
6161
* @var string
6262
*/
63-
protected $attributeElement = '.entry-edit.have-price';
63+
protected $attributeElement = 'tr[data-row-number]';
6464

6565
/**
6666
* Delete variation button selector.
6767
*
6868
* @var string
6969
*/
70-
protected $deleteVariationButton = '.action-delete';
70+
protected $deleteVariation = '[data-bind*="removeProduct"]';
71+
72+
/**
73+
* Action menu
74+
*
75+
* @var string
76+
*/
77+
protected $actionMenu = '.action-select';
7178

7279
/**
7380
* Variations content selector.
@@ -209,9 +216,10 @@ public function getDataFormTab($fields = null, SimpleElement $element = null)
209216
public function deleteAttributes()
210217
{
211218
$attributeElements = $this->_rootElement->getElements($this->attributeElement);
212-
$this->_rootElement->find($this->variationsContent)->click();
213219
foreach (array_reverse($attributeElements) as $element) {
214-
$element->find($this->deleteVariationButton)->click();
220+
$element->find($this->actionMenu)->hover();
221+
$element->find($this->actionMenu)->click();
222+
$element->find($this->deleteVariation)->click();
215223
}
216224
}
217225
}

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,26 @@ class Attribute extends Form
160160
*/
161161
public function fillAttributes(array $attributes)
162162
{
163+
$attributesFilters = [];
163164
foreach ($attributes as $attribute) {
164165
if (empty($attribute['attribute_id'])) {
165166
$this->createNewVariationSet($attribute);
166167
}
168+
$attributesFilters[] = ['frontend_label' => $attribute['frontend_label']];
167169
}
168170

171+
//select attributes
172+
$this->getAttributesGrid()->resetFilter();
173+
if ($this->_rootElement->find('[class$=no-data]')->isVisible()) {
174+
return;
175+
}
176+
$this->getAttributesGrid()->selectItems($attributesFilters);
177+
178+
$this->browser->find($this->nextButton)->click();
179+
$this->getTemplateBlock()->waitLoader();
180+
181+
//update attributes options
169182
foreach ($attributes as $attribute) {
170-
$this->getAttributesGrid()->searchAndSelect(['frontend_label' => $attribute['frontend_label']]);
171-
$this->browser->find($this->nextButton)->click();
172-
$this->getTemplateBlock()->waitLoader();
173183
$this->updateOptions($attribute);
174184
}
175185

@@ -272,6 +282,7 @@ protected function updateOptions(array $attribute)
272282
$label = isset($option['admin']) ? $option['admin'] : $option['label'];
273283
$optionContainer = $attributeBlock->find(sprintf($this->attributeOptionByName, $label));
274284

285+
//Create option
275286
if (!$optionContainer->isVisible()) {
276287
$mapping = $this->dataMapping($option);
277288
$attributeBlock->find($this->addOption)->click();
@@ -282,6 +293,11 @@ protected function updateOptions(array $attribute)
282293
->setValue($mapping['label']['value']);
283294
$this->getTemplateBlock()->waitLoader();
284295
$optionContainer->find('[data-action=save]')->click();
296+
$optionContainer = $attributeBlock->find(sprintf($this->attributeOptionByName, $label));
297+
}
298+
//Select option
299+
if (!$optionContainer->find('[type="checkbox"]')->isSelected()) {
300+
$optionContainer->find('[type="checkbox"]')->click();
285301
}
286302
}
287303
}

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ class AssertChildProductsInGrid extends AbstractConstraint
3131
public function processAssert(CatalogProductIndex $productGrid, ConfigurableProduct $product)
3232
{
3333
$configurableAttributesData = $product->getConfigurableAttributesData();
34-
$productType = $product->getProductHasWeight() === "Yes" ? 'Simple Product' : 'Virtual Product';
3534
$errors = [];
3635

3736
$productGrid->open();
3837
foreach ($configurableAttributesData['matrix'] as $variation) {
3938
$filter = [
4039
'name' => $variation['name'],
41-
'type' => $productType,
40+
'type' => (isset($variation['weight']) && (int)$variation['weight'] > 0)
41+
? 'Simple Product' : 'Virtual Product',
4242
'sku' => $variation['sku'],
4343
'visibility' => self::NOT_VISIBLE_INDIVIDUALLY,
4444
];

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function verifyPrice()
4747

4848
if ($fixturePrice != $formPrice) {
4949
return "Displayed product price on product page(front-end) not equals passed from fixture. "
50-
. "Actual: {$fixturePrice}, expected: {$formPrice}.";
50+
. "Actual: {$formPrice}, expected: {$fixturePrice}.";
5151
}
5252
return null;
5353
}

‎dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options</data>
3939
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
4040
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
41+
<data name="product/data/price/dataset" xsi:type="string">default</data>
4142
<data name="product/data/short_description" xsi:type="string">Configurable short description</data>
4243
<data name="product/data/description" xsi:type="string">Configurable Product description %isolation%</data>
4344
<data name="product/data/weight" xsi:type="string">2</data>
@@ -80,6 +81,7 @@
8081
<data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_options_with_assigned_product</data>
8182
<data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
8283
<data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
84+
<data name="product/data/price/dataset" xsi:type="string">default</data>
8385
<data name="product/data/short_description" xsi:type="string">Configurable short description</data>
8486
<data name="product/data/description" xsi:type="string">Configurable Product description %isolation%</data>
8587
<data name="product/data/weight" xsi:type="string">2</data>

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<variation name="CreateDownloadableProductEntityTestVariation1" summary="Create Downloadable Product with Required Fields Only and Assign it to the Category" ticketId="MAGETWO-13595">
1111
<data name="product/data/name" xsi:type="string">DownloadableProduct_%isolation%</data>
1212
<data name="product/data/sku" xsi:type="string">DownloadableProduct_%isolation%</data>
13+
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">10</data>
14+
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
1315
<data name="product/data/price/value" xsi:type="string">1</data>
1416
<data name="product/data/category" xsi:type="string">category %isolation%</data>
1517
<data name="product/data/downloadable_links/dataset" xsi:type="string">one_separately_link</data>
@@ -128,7 +130,6 @@
128130
<data name="product/data/tax_class_id/dataset" xsi:type="string">taxable_goods</data>
129131
<data name="product/data/product_has_weight" xsi:type="string">No</data>
130132
<data name="product/data/category" xsi:type="string">Default Category</data>
131-
<data name="product/data/stock_data/manage_stock" xsi:type="string">Yes</data>
132133
<data name="product/data/stock_data/qty" xsi:type="string">123</data>
133134
<data name="product/data/stock_data/use_config_min_qty" xsi:type="string">No</data>
134135
<data name="product/data/stock_data/min_qty" xsi:type="string">123</data>

0 commit comments

Comments
 (0)