Skip to content

Commit d38a7a0

Browse files
author
Dmytro Aponasenko
committed
MTA-2350: Add wait to form element before filling a value
1 parent c2c87fa commit d38a7a0

File tree

28 files changed

+220
-319
lines changed

28 files changed

+220
-319
lines changed

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Page/Product/CatalogProductView.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9-
<page name="CatalogProductView" area="Product" mca="catalog/product/view">
10-
<block name="viewBlock">
11-
<render name="bundle" class="Magento\Bundle\Test\Block\Catalog\Product\View"/>
12-
</block>
13-
<block name="bundleViewBlock" class="Magento\Bundle\Test\Block\Catalog\Product\View" locator="#maincontent" strategy="css selector"/>
14-
</page>
9+
<page name="CatalogProductView" area="Product" mca="catalog/product/view">
10+
<block name="viewBlock">
11+
<render name="bundle" class="Magento\Bundle\Test\Block\Catalog\Product\View" />
12+
</block>
13+
<block name="bundleViewBlock" class="Magento\Bundle\Test\Block\Catalog\Product\View" locator="#maincontent" strategy="css selector" />
14+
</page>
1515
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main/EditForm.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<mapping strict="0">
8+
<mapping strict="1">
99
<fields>
1010
<attribute_set_name />
1111
</fields>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Magento\Mtf\Fixture\FixtureInterface;
1212

1313
/**
14-
* Class AssertProductInGrid
1514
* Assert that product is present in products grid.
1615
*/
1716
class AssertProductInGrid extends AbstractConstraint
@@ -63,7 +62,7 @@ protected function prepareFilter()
6362
}
6463

6564
/**
66-
* Get product type
65+
* Get product type.
6766
*
6867
* @return string
6968
*/

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductAttribute.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@
111111
<field name="is_wysiwyg_enabled" is_required="">
112112
<default_value xsi:type="number">0</default_value>
113113
</field>
114-
<field name="is_used_for_promo_rules" is_required="">
114+
<field name="is_used_for_promo_rules" is_required="" group="frontend-properties">
115115
<default_value xsi:type="number">0</default_value>
116116
</field>
117117
<field name="search_weight" is_required="">
118118
<default_value xsi:type="string">1</default_value>
119119
</field>
120-
<field name="options" is_required="" source="Magento\Catalog\Test\Fixture\CatalogProductAttribute\Options">
120+
<field name="options" is_required="" group="properties" source="Magento\Catalog\Test\Fixture\CatalogProductAttribute\Options">
121121
<default_value xsi:type="null"/>
122122
</field>
123123
<field name="default_value_text" group="advanced-properties"/>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateAttributeSetEntityTest">
10-
<variation name="CreateAttributeSetEntityTestVariation1">
11-
<data name="attributeSet/data/attribute_set_name" xsi:type="string">ProductTemplate%isolation%</data>
12-
<data name="attributeSet/data/skeleton_set/dataSet" xsi:type="string">default</data>
13-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateSuccessSaveMessage"/>
14-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateForm"/>
15-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateInGrid"/>
16-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateOnProductForm"/>
17-
</variation>
18-
</testCase>
9+
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\CreateAttributeSetEntityTest">
10+
<variation name="CreateAttributeSetEntityTestVariation1">
11+
<data name="attributeSet/data/attribute_set_name" xsi:type="string">ProductTemplate%isolation%</data>
12+
<data name="attributeSet/data/skeleton_set/dataSet" xsi:type="string">default</data>
13+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateSuccessSaveMessage" />
14+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateForm" />
15+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateInGrid" />
16+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateOnProductForm" />
17+
</variation>
18+
</testCase>
1919
</config>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\UpdateAttributeSetTest">
10-
<variation name="UpdateAttributeSetTestVariation1">
11-
<data name="attributeSet/data/attribute_set_name" xsi:type="string">ProductTemplateEdit1%isolation%</data>
12-
<data name="attributeSet/data/group" xsi:type="string">Custom-group%isolation%</data>
13-
<data name="attributeSetOriginal/dataSet" xsi:type="string">custom_attribute_set</data>
14-
<data name="productAttributeOriginal/dataSet" xsi:type="string">attribute_type_text_field</data>
15-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateSuccessSaveMessage"/>
16-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateForm"/>
17-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateInGrid"/>
18-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateOnProductForm"/>
19-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateGroupOnProductForm"/>
20-
</variation>
21-
</testCase>
9+
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\UpdateAttributeSetTest">
10+
<variation name="UpdateAttributeSetTestVariation1">
11+
<data name="attributeSet/data/attribute_set_name" xsi:type="string">ProductTemplateEdit1%isolation%</data>
12+
<data name="attributeSet/data/group" xsi:type="string">Custom-group%isolation%</data>
13+
<data name="attributeSetOriginal/dataSet" xsi:type="string">custom_attribute_set</data>
14+
<data name="productAttributeOriginal/dataSet" xsi:type="string">attribute_type_text_field</data>
15+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateSuccessSaveMessage" />
16+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateForm" />
17+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateInGrid" />
18+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateOnProductForm" />
19+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTemplateGroupOnProductForm" />
20+
</variation>
21+
</testCase>
2222
</config>

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

Lines changed: 44 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,58 +6,48 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9-
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\UpdateProductAttributeEntityTest">
10-
<variation name="UpdateProductAttributeEntityTestVariation1">
11-
<data name="productTemplate/dataSet" xsi:type="string">custom_attribute_set</data>
12-
<data name="productAttributeOriginal/dataSet" xsi:type="string">attribute_type_text_field</data>
13-
<data name="attribute/data/frontend_label" xsi:type="string">Text_Field_%isolation%</data>
14-
<data name="attribute/data/frontend_input" xsi:type="string">-</data>
15-
<data name="attribute/data/options/preset" xsi:type="string">-</data>
16-
<data name="attribute/data/is_required" xsi:type="string">Yes</data>
17-
<data name="attribute/data/attribute_code" xsi:type="string">-</data>
18-
<data name="attribute/data/is_global" xsi:type="string">Global</data>
19-
<data name="attribute/data/default_value_text" xsi:type="string">attribute_edited%isolation%</data>
20-
<data name="attribute/data/is_unique" xsi:type="string">Yes</data>
21-
<data name="attribute/data/manage_frontend_label" xsi:type="string">-</data>
22-
<data name="attribute/data/is_searchable" xsi:type="string">Yes</data>
23-
<data name="attribute/data/is_visible_in_advanced_search" xsi:type="string">Yes</data>
24-
<data name="attribute/data/is_comparable" xsi:type="string">Yes</data>
25-
<data name="attribute/data/is_filterable" xsi:type="string">-</data>
26-
<data name="attribute/data/is_filterable_in_search" xsi:type="string">-</data>
27-
<data name="attribute/data/is_used_for_promo_rules" xsi:type="string">Yes</data>
28-
<data name="attribute/data/is_html_allowed_on_front" xsi:type="string">Yes</data>
29-
<data name="attribute/data/is_visible_on_front" xsi:type="string">Yes</data>
30-
<data name="attribute/data/used_in_product_listing" xsi:type="string">Yes</data>
31-
<data name="attribute/data/used_for_sort_by" xsi:type="string">Yes</data>
32-
<data name="isRequired" xsi:type="string">Yes</data>
33-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSaveMessage"/>
34-
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm"/>
35-
</variation>
36-
<variation name="UpdateProductAttributeEntityTestVariation2">
37-
<data name="productTemplate/dataSet" xsi:type="string">custom_attribute_set</data>
38-
<data name="productAttributeOriginal/dataSet" xsi:type="string">attribute_type_dropdown</data>
39-
<data name="attribute/data/frontend_label" xsi:type="string">Dropdown_%isolation%</data>
40-
<data name="attribute/data/frontend_input" xsi:type="string">-</data>
41-
<data name="attribute/data/options/preset" xsi:type="string">default</data>
42-
<data name="attribute/data/is_required" xsi:type="string">Yes</data>
43-
<data name="attribute/data/attribute_code" xsi:type="string">-</data>
44-
<data name="attribute/data/is_global" xsi:type="string">Global</data>
45-
<data name="attribute/data/default_value_text" xsi:type="string">-</data>
46-
<data name="attribute/data/is_unique" xsi:type="string">Yes</data>
47-
<data name="attribute/data/manage_frontend_label" xsi:type="string">-</data>
48-
<data name="attribute/data/is_searchable" xsi:type="string">Yes</data>
49-
<data name="attribute/data/is_visible_in_advanced_search" xsi:type="string">Yes</data>
50-
<data name="attribute/data/is_comparable" xsi:type="string">Yes</data>
51-
<data name="attribute/data/is_filterable" xsi:type="string">Filterable (with results)</data>
52-
<data name="attribute/data/is_filterable_in_search" xsi:type="string">Yes</data>
53-
<data name="attribute/data/is_used_for_promo_rules" xsi:type="string">No</data>
54-
<data name="attribute/data/is_html_allowed_on_front" xsi:type="string">Yes</data>
55-
<data name="attribute/data/is_visible_on_front" xsi:type="string">Yes</data>
56-
<data name="attribute/data/used_in_product_listing" xsi:type="string">Yes</data>
57-
<data name="attribute/data/used_for_sort_by" xsi:type="string">Yes</data>
58-
<data name="isRequired" xsi:type="string">Yes</data>
59-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSaveMessage"/>
60-
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm"/>
61-
</variation>
62-
</testCase>
9+
<testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\UpdateProductAttributeEntityTest">
10+
<variation name="UpdateProductAttributeEntityTestVariation1">
11+
<data name="productTemplate/dataSet" xsi:type="string">custom_attribute_set</data>
12+
<data name="productAttributeOriginal/dataSet" xsi:type="string">attribute_type_text_field</data>
13+
<data name="attribute/data/frontend_label" xsi:type="string">Text_Field_%isolation%</data>
14+
<data name="attribute/data/is_required" xsi:type="string">Yes</data>
15+
<data name="attribute/data/is_global" xsi:type="string">Global</data>
16+
<data name="attribute/data/default_value_text" xsi:type="string">attribute_edited%isolation%</data>
17+
<data name="attribute/data/is_unique" xsi:type="string">Yes</data>
18+
<data name="attribute/data/is_searchable" xsi:type="string">Yes</data>
19+
<data name="attribute/data/is_visible_in_advanced_search" xsi:type="string">Yes</data>
20+
<data name="attribute/data/is_comparable" xsi:type="string">Yes</data>
21+
<data name="attribute/data/is_used_for_promo_rules" xsi:type="string">Yes</data>
22+
<data name="attribute/data/is_html_allowed_on_front" xsi:type="string">Yes</data>
23+
<data name="attribute/data/is_visible_on_front" xsi:type="string">Yes</data>
24+
<data name="attribute/data/used_in_product_listing" xsi:type="string">Yes</data>
25+
<data name="attribute/data/used_for_sort_by" xsi:type="string">Yes</data>
26+
<data name="isRequired" xsi:type="string">Yes</data>
27+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSaveMessage" />
28+
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
29+
</variation>
30+
<variation name="UpdateProductAttributeEntityTestVariation2">
31+
<data name="productTemplate/dataSet" xsi:type="string">custom_attribute_set</data>
32+
<data name="productAttributeOriginal/dataSet" xsi:type="string">attribute_type_dropdown</data>
33+
<data name="attribute/data/frontend_label" xsi:type="string">Dropdown_%isolation%</data>
34+
<data name="attribute/data/options/preset" xsi:type="string">default</data>
35+
<data name="attribute/data/is_required" xsi:type="string">Yes</data>
36+
<data name="attribute/data/is_global" xsi:type="string">Global</data>
37+
<data name="attribute/data/is_unique" xsi:type="string">Yes</data>
38+
<data name="attribute/data/is_searchable" xsi:type="string">Yes</data>
39+
<data name="attribute/data/is_visible_in_advanced_search" xsi:type="string">Yes</data>
40+
<data name="attribute/data/is_comparable" xsi:type="string">Yes</data>
41+
<data name="attribute/data/is_filterable" xsi:type="string">Filterable (with results)</data>
42+
<data name="attribute/data/is_filterable_in_search" xsi:type="string">Yes</data>
43+
<data name="attribute/data/is_used_for_promo_rules" xsi:type="string">No</data>
44+
<data name="attribute/data/is_html_allowed_on_front" xsi:type="string">Yes</data>
45+
<data name="attribute/data/is_visible_on_front" xsi:type="string">Yes</data>
46+
<data name="attribute/data/used_in_product_listing" xsi:type="string">Yes</data>
47+
<data name="attribute/data/used_for_sort_by" xsi:type="string">Yes</data>
48+
<data name="isRequired" xsi:type="string">Yes</data>
49+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSaveMessage" />
50+
<constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
51+
</variation>
52+
</testCase>
6353
</config>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ public function fillBilling(
4848
$isShippingAddress = false
4949
) {
5050
if ($billingAddress) {
51-
//@TODO: MAGETWO-34756
52-
sleep(5);
5351
$this->fill($billingAddress);
5452
}
5553
if ($isShippingAddress) {

‎dev/tests/functional/tests/app/Magento/Customer/Test/Handler/Customer/Curl.php

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,23 +195,27 @@ protected function updateCustomer(array $data)
195195
*/
196196
protected function prepareAddressData(array $curlData)
197197
{
198+
$address = [];
198199
foreach (array_keys($curlData['address']) as $key) {
199-
$curlData['address'][$key]['_deleted'] = '';
200-
$curlData['address'][$key]['region'] = '';
201-
if (!is_array($curlData['address'][$key]['street'])) {
202-
$street = $curlData['address'][$key]['street'];
203-
$curlData['address'][$key]['street'] = [];
204-
$curlData['address'][$key]['street'][] = $street;
200+
$addressKey = 'new_' . $key;
201+
$address[$addressKey] = $curlData['address'][$key];
202+
$address[$addressKey]['_deleted'] = '';
203+
$address[$addressKey]['region'] = '';
204+
if (!is_array($address[$addressKey]['street'])) {
205+
$street = $address[$addressKey]['street'];
206+
$address[$addressKey]['street'] = [];
207+
$address[$addressKey]['street'][] = $street;
205208
}
206-
if (isset($curlData['address'][$key]['default_billing'])) {
207-
$value = $curlData['address'][$key]['default_billing'] === 'Yes' ? 'true' : 'false';
208-
$curlData['address'][$key]['default_billing'] = $value;
209+
if (isset($address[$addressKey]['default_billing'])) {
210+
$value = $address[$addressKey]['default_billing'] === 'Yes' ? 'true' : 'false';
211+
$address[$addressKey]['default_billing'] = $value;
209212
}
210-
if (isset($curlData['address'][$key]['default_shipping'])) {
211-
$value = $curlData['address'][$key]['default_shipping'] === 'Yes' ? 'true' : 'false';
212-
$curlData['address'][$key]['default_shipping'] = $value;
213+
if (isset($address[$addressKey]['default_shipping'])) {
214+
$value = $address[$addressKey]['default_shipping'] === 'Yes' ? 'true' : 'false';
215+
$address[$addressKey]['default_shipping'] = $value;
213216
}
214217
}
218+
$curlData['address'] = $address;
215219

216220
return $curlData;
217221
}

‎dev/tests/functional/tests/app/Magento/Customer/Test/Repository/Address.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public function __construct(array $defaultConfig = [], array $defaultData = [])
2525
'data' => $defaultData,
2626
];
2727

28-
$this->_data['address_US_1'] = $this->_getUS1();
29-
$this->_data['address_US_2'] = $this->_getUS2();
28+
$this->_data['US_address_1'] = $this->_getUS1();
29+
$this->_data['US_address_2'] = $this->_getUS2();
3030
$this->_data['address_UK'] = $this->getAddressUK();
3131
$this->_data['address_UK_2'] = $this->getAddressUK2();
3232
$this->_data['address_UK_with_VAT'] = $this->getAddressUKWithVAT($this->_data['address_UK']);

0 commit comments

Comments
 (0)