Skip to content

Commit 4edf34a

Browse files
author
Dmytro Aponasenko
committed
MTA-2350: Add wait to form element before filling a value
1 parent 6d02b6b commit 4edf34a

File tree

9 files changed

+33
-22
lines changed

9 files changed

+33
-22
lines changed

‎dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageRewriteEntityTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function test(UrlRewrite $urlRewrite)
7575
//Steps
7676
$this->urlRewriteIndex->open();
7777
$this->urlRewriteIndex->getPageActionsBlock()->addNew();
78-
$this->urlRewriteEdit->getFormBlock()->fill($urlRewrite);
78+
$this->urlRewriteEdit->getUrlRewriteTypeSelectorBlock()->selectType($urlRewrite->getEntityType());
7979
$cmsPage = $urlRewrite->getDataFieldConfig('target_path')['source']->getEntity();
8080
$filter = ['title' => $cmsPage->getTitle()];
8181
$this->urlRewriteEdit->getCmsGridBlock()->searchAndOpen($filter);

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,12 @@ protected function updateOptions(array $attribute)
247247
$attributeBlock->find($this->addOption)->click();
248248
}
249249
$mapping = $this->dataMapping($option);
250-
$this->_fill($mapping, $optionContainer);
250+
foreach ($mapping as $name => $field) {
251+
$element = $this->getElement($optionContainer, $field);
252+
if ($element->isVisible() && !$element->isDisabled()) {
253+
$element->setValue($field['value']);
254+
}
255+
}
251256
}
252257
}
253258

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public function fill(FixtureInterface $product, SimpleElement $element = null, F
3434
}
3535

3636
$this->showAdvancedSettings();
37+
$this->getTab('variations')->showContent();
3738
return $this->fillTabs($tabs, $element);
3839
}
3940
}

‎dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/Currency/Rate/CurrencyRateForm.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
<wrapper>rate</wrapper>
1010
<fields>
1111
<rate>

‎dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Block/Adminhtml/System/CurrencySymbolForm.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ class CurrencySymbolForm extends Form
3434
public function fill(FixtureInterface $fixture, SimpleElement $element = null)
3535
{
3636
$element = $this->_rootElement->find(sprintf($this->currencyRow, $fixture->getCode()), Locator::SELECTOR_XPATH);
37-
return parent::fill($fixture, $element);
37+
$data = $fixture->getData();
38+
unset($data['code']);
39+
$mapping = $this->dataMapping($data);
40+
$this->_fill($mapping, $element);
41+
return $this;
3842
}
3943
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">10</data>
115115
<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
116116
<data name="product/data/is_virtual" xsi:type="string">Yes</data>
117-
<data name="product/data/weight" xsi:type="string">10</data>
118117
<data name="product/data/special_price" xsi:type="string">40</data>
119118
<data name="isRequired" xsi:type="string">No</data>
120119
<data name="product/data/url_key" xsi:type="string">downloadableproduct-%isolation%</data>

‎dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ public function processAssert(
3131
TaxRate $taxRate,
3232
TaxRate $initialTaxRate = null
3333
) {
34-
$data = ($initialTaxRate !== null)
35-
? array_merge($initialTaxRate->getData(), $taxRate->getData())
36-
: $taxRate->getData();
37-
$data = $this->prepareData($data);
34+
$data = $this->prepareData($taxRate, $initialTaxRate);
3835
$filter = [
3936
'code' => $data['code'],
4037
];
@@ -53,11 +50,20 @@ public function processAssert(
5350
/**
5451
* Preparing data for verification
5552
*
56-
* @param array $data
53+
* @param TaxRate $taxRate
54+
* @param TaxRate $initialTaxRate
5755
* @return array
5856
*/
59-
protected function prepareData(array $data)
57+
protected function prepareData(TaxRate $taxRate, TaxRate $initialTaxRate)
6058
{
59+
if ($initialTaxRate !== null) {
60+
$data = array_merge($initialTaxRate->getData(), $taxRate->getData());
61+
if ($taxRate->hasData('tax_country_id') && !$taxRate->hasData('tax_region_id')) {
62+
unset($data['tax_region_id']);
63+
}
64+
} else {
65+
$data = $taxRate->getData();
66+
}
6167
if ($data['zip_is_range'] === 'Yes') {
6268
unset($data['tax_postcode']);
6369
} else {

‎dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRateEntityTest.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<data name="initialTaxRate/dataSet" xsi:type="string">default</data>
1212
<data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
1313
<data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
14-
<data name="taxRate/data/zip_from" xsi:type="string">-</data>
15-
<data name="taxRate/data/zip_to" xsi:type="string">-</data>
1614
<data name="taxRate/data/tax_postcode" xsi:type="string">90001</data>
1715
<data name="taxRate/data/tax_country_id" xsi:type="string">United States</data>
1816
<data name="taxRate/data/tax_region_id" xsi:type="string">California</data>
@@ -27,7 +25,6 @@
2725
<data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
2826
<data name="taxRate/data/zip_from" xsi:type="string">90001</data>
2927
<data name="taxRate/data/zip_to" xsi:type="string">96162</data>
30-
<data name="taxRate/data/tax_postcode" xsi:type="string">-</data>
3128
<data name="taxRate/data/tax_country_id" xsi:type="string">United States</data>
3229
<data name="taxRate/data/tax_region_id" xsi:type="string">California</data>
3330
<data name="taxRate/data/rate" xsi:type="string">15.05</data>
@@ -39,8 +36,6 @@
3936
<data name="initialTaxRate/dataSet" xsi:type="string">default</data>
4037
<data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
4138
<data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
42-
<data name="taxRate/data/zip_from" xsi:type="string">-</data>
43-
<data name="taxRate/data/zip_to" xsi:type="string">-</data>
4439
<data name="taxRate/data/tax_postcode" xsi:type="string">*</data>
4540
<data name="taxRate/data/tax_country_id" xsi:type="string">United Kingdom</data>
4641
<data name="taxRate/data/rate" xsi:type="string">777</data>
@@ -52,8 +47,6 @@
5247
<data name="initialTaxRate/dataSet" xsi:type="string">withZipRange</data>
5348
<data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
5449
<data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
55-
<data name="taxRate/data/zip_from" xsi:type="string">-</data>
56-
<data name="taxRate/data/zip_to" xsi:type="string">-</data>
5750
<data name="taxRate/data/tax_postcode" xsi:type="string">180</data>
5851
<data name="taxRate/data/tax_country_id" xsi:type="string">Canada</data>
5952
<data name="taxRate/data/tax_region_id" xsi:type="string">*</data>
@@ -68,7 +61,6 @@
6861
<data name="taxRate/data/zip_is_range" xsi:type="string">Yes</data>
6962
<data name="taxRate/data/zip_from" xsi:type="string">1</data>
7063
<data name="taxRate/data/zip_to" xsi:type="string">7800935</data>
71-
<data name="taxRate/data/tax_postcode" xsi:type="string">-</data>
7264
<data name="taxRate/data/tax_country_id" xsi:type="string">United Kingdom</data>
7365
<data name="taxRate/data/rate" xsi:type="string">12.99</data>
7466
<constraint name="Magento\Tax\Test\Constraint\AssertTaxRateSuccessSaveMessage" />
@@ -78,8 +70,6 @@
7870
<data name="initialTaxRate/dataSet" xsi:type="string">withZipRange</data>
7971
<data name="taxRate/data/code" xsi:type="string">TaxIdentifier%isolation%</data>
8072
<data name="taxRate/data/zip_is_range" xsi:type="string">No</data>
81-
<data name="taxRate/data/zip_from" xsi:type="string">-</data>
82-
<data name="taxRate/data/zip_to" xsi:type="string">-</data>
8373
<data name="taxRate/data/tax_postcode" xsi:type="string">*</data>
8474
<data name="taxRate/data/tax_country_id" xsi:type="string">France</data>
8575
<data name="taxRate/data/tax_region_id" xsi:type="string">Val-d'Oise</data>

‎dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Edit/UrlRewriteForm.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public function fill(
2929
SimpleElement $element = null,
3030
array $replace = []
3131
) {
32+
$context = ($element === null) ? $this->_rootElement : $element;
3233
$data = $fixture->getData();
3334
if (empty($data['entity_type']) && empty($this->getData()['target_path']) && !isset($data['target_path'])) {
3435
$entity = $fixture->getDataFieldConfig('target_path')['source']->getEntity();
@@ -44,7 +45,12 @@ public function fill(
4445
}
4546

4647
$mapping = $this->dataMapping($data);
47-
$this->_fill($mapping, $element);
48+
foreach ($mapping as $name => $field) {
49+
$element = $this->getElement($context, $field);
50+
if ($element->isVisible() && !$element->isDisabled()) {
51+
$element->setValue($field['value']);
52+
}
53+
}
4854

4955
return $this;
5056
}

0 commit comments

Comments
 (0)