Skip to content

Commit 95cf2c4

Browse files
author
Dmytro Aponasenko
committed
Merge branch 'MTA-1431' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop
2 parents f1d0233 + 7a69458 commit 95cf2c4

File tree

49 files changed

+882
-1078
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+882
-1078
lines changed

‎dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/NavigateMenuTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class NavigateMenuTest extends Injectable
2222
/* tags */
2323
const MVP = 'no';
2424
const DOMAIN = 'CS, MX, PS';
25+
const TO_MAINTAIN = 'yes';
2526
/* end tags */
2627

2728
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<constraint name="Magento\Bundle\Test\Constraint\AssertBundleItemsOnProductPage" />
100100
</variation>
101101
<variation name="CreateBundleProductEntityTestVariation5">
102+
<data name="tag" xsi:type="string">to_maintain:yes</data>
102103
<data name="description" xsi:type="string">Create fixed bundle with all types options</data>
103104
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
104105
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
@@ -136,6 +137,7 @@
136137
<constraint name="Magento\Bundle\Test\Constraint\AssertBundlePriceType" />
137138
</variation>
138139
<variation name="CreateBundleProductEntityTestVariation6">
140+
<data name="tag" xsi:type="string">to_maintain:yes</data>
139141
<data name="description" xsi:type="string">Create fixed bundle which is out of stock</data>
140142
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
141143
<data name="product/data/name" xsi:type="string">BundleProduct %isolation%</data>
@@ -228,6 +230,7 @@
228230
<constraint name="Magento\Bundle\Test\Constraint\AssertBundlePriceType" />
229231
</variation>
230232
<variation name="CreateBundleProductEntityTestVariation10">
233+
<data name="tag" xsi:type="string">to_maintain:yes</data>
231234
<data name="description" xsi:type="string">Create dynamic bundle</data>
232235
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
233236
<data name="product/data/name" xsi:type="string">Bundle Dynamic %isolation%</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ class ProductForm extends FormTabs
9999
*/
100100
public function fill(FixtureInterface $product, SimpleElement $element = null, FixtureInterface $category = null)
101101
{
102+
$this->waitPageToLoad();
102103
$dataConfig = $product->getDataConfig();
103104
$typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null;
104105

@@ -159,6 +160,18 @@ public function getData(FixtureInterface $fixture = null, SimpleElement $element
159160
return parent::getData($fixture, $element);
160161
}
161162

163+
/**
164+
* Open tab.
165+
*
166+
* @param string $tabName
167+
* @return Tab
168+
*/
169+
public function openTab($tabName)
170+
{
171+
$this->showAdvancedSettings();
172+
return parent::openTab($tabName);
173+
}
174+
162175
/**
163176
* Show Advanced Setting.
164177
*
@@ -174,15 +187,27 @@ protected function showAdvancedSettings()
174187
}
175188

176189
/**
177-
* Open tab.
190+
* Wait page to load.
178191
*
179-
* @param string $tabName
180-
* @return Tab
192+
* @return void
181193
*/
182-
public function openTab($tabName)
194+
protected function waitPageToLoad()
183195
{
184-
$this->showAdvancedSettings();
185-
return parent::openTab($tabName);
196+
$browser = $this->browser;
197+
$element = $this->advancedSettingContent;
198+
$advancedSettingTrigger = $this->advancedSettingTrigger;
199+
200+
$this->_rootElement->waitUntil(
201+
function () use ($browser, $advancedSettingTrigger) {
202+
return $browser->find($advancedSettingTrigger)->isVisible() == true ? true : null;
203+
}
204+
);
205+
206+
$this->_rootElement->waitUntil(
207+
function () use ($browser, $element) {
208+
return $browser->find($element)->isVisible() == false ? true : null;
209+
}
210+
);
186211
}
187212

188213
/**

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@
257257
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
258258
</variation>
259259
<variation name="CreateSimpleProductEntityTestVariation15">
260+
<data name="tag" xsi:type="string">to_maintain:yes</data>
260261
<data name="description" xsi:type="string">Create product with tax class and group price</data>
261262
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
262263
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
@@ -316,6 +317,7 @@
316317
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
317318
</variation>
318319
<variation name="CreateSimpleProductEntityTestVariation18">
320+
<data name="tag" xsi:type="string">to_maintain:yes</data>
319321
<data name="description" xsi:type="string">Create product wit suite of custom options</data>
320322
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
321323
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class ProductTypeSwitchingOnCreationTest extends Injectable
3030
/* tags */
3131
const MVP = 'yes';
3232
const DOMAIN = 'MX';
33+
const TO_MAINTAIN = 'yes';
3334
/* end tags */
3435

3536
/**

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

Lines changed: 5 additions & 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="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnUpdateTest">
1010
<variation name="ProductTypeSwitchingOnUpdateTestVariation1">
11+
<data name="tag" xsi:type="string">stable:no</data>
1112
<data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
1213
<data name="product" xsi:type="string">configurableProduct::default</data>
1314
<data name="actionName" xsi:type="string">-</data>
@@ -27,13 +28,15 @@
2728
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
2829
</variation>
2930
<variation name="ProductTypeSwitchingOnUpdateTestVariation3">
31+
<data name="tag" xsi:type="string">stable:no</data>
3032
<data name="productOrigin" xsi:type="string">configurableProduct::default</data>
3133
<data name="product" xsi:type="string">catalogProductSimple::default</data>
3234
<data name="actionName" xsi:type="string">deleteAttributes</data>
3335
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
3436
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
3537
</variation>
3638
<variation name="ProductTypeSwitchingOnUpdateTestVariation4">
39+
<data name="tag" xsi:type="string">stable:no</data>
3740
<data name="productOrigin" xsi:type="string">configurableProduct::default</data>
3841
<data name="product" xsi:type="string">catalogProductVirtual::default</data>
3942
<data name="actionName" xsi:type="string">deleteAttributes</data>
@@ -48,6 +51,7 @@
4851
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
4952
</variation>
5053
<variation name="ProductTypeSwitchingOnUpdateTestVariation6">
54+
<data name="tag" xsi:type="string">stable:no</data>
5155
<data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
5256
<data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
5357
<data name="actionName" xsi:type="string">-</data>
@@ -78,6 +82,7 @@
7882
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
7983
</variation>
8084
<variation name="ProductTypeSwitchingOnUpdateTestVariation9">
85+
<data name="tag" xsi:type="string">stable:no</data>
8186
<data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
8287
<data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
8388
<data name="actionName" xsi:type="string">-</data>

‎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
@@ -104,6 +104,7 @@
104104
<constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
105105
</variation>
106106
<variation name="UpdateSimpleProductEntityTestVariation7">
107+
<data name="tag" xsi:type="string">stable:no</data>
107108
<data name="description" xsi:type="string">Update category</data>
108109
<data name="initialProduct/dataSet" xsi:type="string">product_with_category</data>
109110
<data name="product/data/category_ids/presets" xsi:type="string">default</data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class CreateProductAttributeEntityFromProductPageTest extends Scenario
3737
/* tags */
3838
const MVP = 'yes';
3939
const DOMAIN = 'MX';
40+
const TO_MAINTAIN = 'yes';
4041
/* end tags */
4142

4243
/**

0 commit comments

Comments
 (0)