Skip to content

Commit aabd664

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

File tree

9 files changed

+107
-131
lines changed

9 files changed

+107
-131
lines changed

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc26",
3+
"magento/mtf": "1.0.0-rc27",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
7171
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
7272
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
73-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
7473
</variation>
7574
<variation name="UpdateSimpleProductEntityTestVariation5">
7675
<data name="description" xsi:type="string">Update stock to Out of Stock</data>

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

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
1616
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
1717
<data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
18-
<data name="product/data/group_price/preset" xsi:type="string">-</data>
19-
<data name="product/data/special_price" xsi:type="string">-</data>
2018
<data name="product/data/tier_price/preset" xsi:type="string">MAGETWO-23002</data>
2119
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
22-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
2320
<data name="product/data/visibility" xsi:type="string">Catalog</data>
2421
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
2522
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -38,18 +35,13 @@
3835
<data name="product/data/tax_class_id/dataSet" xsi:type="string">taxable_goods</data>
3936
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
4037
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
41-
<data name="product/data/category_ids/presets" xsi:type="string">-</data>
42-
<data name="product/data/group_price/preset" xsi:type="string">-</data>
4338
<data name="product/data/special_price" xsi:type="string">45</data>
44-
<data name="product/data/tier_price/preset" xsi:type="string">-</data>
4539
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
46-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
4740
<data name="product/data/visibility" xsi:type="string">Catalog, Search</data>
4841
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
4942
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
5043
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
5144
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
52-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
5345
<constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
5446
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
5547
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
@@ -64,17 +56,13 @@
6456
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
6557
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
6658
<data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
67-
<data name="product/data/group_price/preset" xsi:type="string">-</data>
68-
<data name="product/data/special_price" xsi:type="string">-</data>
6959
<data name="product/data/tier_price/preset" xsi:type="string">MAGETWO-23002</data>
7060
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
71-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
7261
<data name="product/data/visibility" xsi:type="string">Catalog, Search</data>
7362
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
7463
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
7564
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
7665
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
77-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
7866
<constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
7967
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
8068
<constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
@@ -86,14 +74,8 @@
8674
<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
8775
<data name="product/data/price/value" xsi:type="string">99.99</data>
8876
<data name="product/data/tax_class_id/dataSet" xsi:type="string">taxable_goods</data>
89-
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">-</data>
9077
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
91-
<data name="product/data/category_ids/presets" xsi:type="string">-</data>
92-
<data name="product/data/group_price/preset" xsi:type="string">-</data>
93-
<data name="product/data/special_price" xsi:type="string">-</data>
94-
<data name="product/data/tier_price/preset" xsi:type="string">-</data>
9578
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
96-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
9779
<data name="product/data/visibility" xsi:type="string">Search</data>
9880
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
9981
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -108,14 +90,8 @@
10890
<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
10991
<data name="product/data/price/value" xsi:type="string">5.00</data>
11092
<data name="product/data/tax_class_id/dataSet" xsi:type="string">None</data>
111-
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">-</data>
11293
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
113-
<data name="product/data/category_ids/presets" xsi:type="string">-</data>
114-
<data name="product/data/group_price/preset" xsi:type="string">-</data>
115-
<data name="product/data/special_price" xsi:type="string">-</data>
116-
<data name="product/data/tier_price/preset" xsi:type="string">-</data>
11794
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
118-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
11995
<data name="product/data/visibility" xsi:type="string">Catalog</data>
12096
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
12197
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -134,10 +110,8 @@
134110
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
135111
<data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
136112
<data name="product/data/group_price/preset" xsi:type="string">MAGETWO-23055</data>
137-
<data name="product/data/special_price" xsi:type="string">-</data>
138113
<data name="product/data/tier_price/preset" xsi:type="string">MAGETWO-23002</data>
139114
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
140-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
141115
<data name="product/data/visibility" xsi:type="string">Catalog, Search</data>
142116
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
143117
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -154,14 +128,10 @@
154128
<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
155129
<data name="product/data/price/value" xsi:type="string">99.99</data>
156130
<data name="product/data/tax_class_id/dataSet" xsi:type="string">None</data>
157-
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">-</data>
158131
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
159132
<data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
160-
<data name="product/data/group_price/preset" xsi:type="string">-</data>
161133
<data name="product/data/special_price" xsi:type="string">45</data>
162-
<data name="product/data/tier_price/preset" xsi:type="string">-</data>
163134
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
164-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
165135
<data name="product/data/visibility" xsi:type="string">Catalog, Search</data>
166136
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
167137
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -176,14 +146,9 @@
176146
<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
177147
<data name="product/data/price/value" xsi:type="string">5.00</data>
178148
<data name="product/data/tax_class_id/dataSet" xsi:type="string">taxable_goods</data>
179-
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">-</data>
180149
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
181-
<data name="product/data/category_ids/presets" xsi:type="string">-</data>
182150
<data name="product/data/group_price/preset" xsi:type="string">MAGETWO-23055</data>
183-
<data name="product/data/special_price" xsi:type="string">-</data>
184-
<data name="product/data/tier_price/preset" xsi:type="string">-</data>
185151
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
186-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
187152
<data name="product/data/visibility" xsi:type="string">Search</data>
188153
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
189154
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -201,9 +166,6 @@
201166
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
202167
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
203168
<data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
204-
<data name="product/data/group_price/preset" xsi:type="string">-</data>
205-
<data name="product/data/special_price" xsi:type="string">-</data>
206-
<data name="product/data/tier_price/preset" xsi:type="string">-</data>
207169
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
208170
<data name="product/data/custom_options/preset" xsi:type="string">options-suite</data>
209171
<data name="product/data/visibility" xsi:type="string">Search</data>
@@ -221,14 +183,9 @@
221183
<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
222184
<data name="product/data/price/value" xsi:type="string">99.99</data>
223185
<data name="product/data/tax_class_id/dataSet" xsi:type="string">taxable_goods</data>
224-
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">-</data>
225186
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
226-
<data name="product/data/category_ids/presets" xsi:type="string">-</data>
227187
<data name="product/data/group_price/preset" xsi:type="string">MAGETWO-23055</data>
228-
<data name="product/data/special_price" xsi:type="string">-</data>
229-
<data name="product/data/tier_price/preset" xsi:type="string">-</data>
230188
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">Out of Stock</data>
231-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
232189
<data name="product/data/visibility" xsi:type="string">Catalog, Search</data>
233190
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
234191
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
@@ -247,19 +204,15 @@
247204
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
248205
<data name="product/data/category_ids/presets" xsi:type="string">default_subcategory</data>
249206
<data name="product/data/group_price/preset" xsi:type="string">MAGETWO-23055</data>
250-
<data name="product/data/special_price" xsi:type="string">-</data>
251207
<data name="product/data/tier_price/preset" xsi:type="string">MAGETWO-23002</data>
252208
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
253-
<data name="product/data/custom_options/preset" xsi:type="string">-</data>
254209
<data name="product/data/visibility" xsi:type="string">Catalog</data>
255210
<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
256211
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
257212
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
258213
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
259214
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
260-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
261215
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage" />
262-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
263216
<constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" />
264217
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
265218
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ protected function updateOptions(array $attribute)
247247
$attributeBlock->find($this->addOption)->click();
248248
}
249249
$mapping = $this->dataMapping($option);
250-
foreach ($mapping as $name => $field) {
250+
foreach ($mapping as $field) {
251251
$element = $this->getElement($optionContainer, $field);
252252
if ($element->isVisible() && !$element->isDisabled()) {
253253
$element->setValue($field['value']);

0 commit comments

Comments
 (0)