Skip to content

Commit 1bf7800

Browse files
author
Dmytro Aponasenko
committed
Merge branch 'MTA-2395' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop
2 parents 62f5876 + 17795c9 commit 1bf7800

File tree

5 files changed

+45
-34
lines changed

5 files changed

+45
-34
lines changed

‎dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ class Form extends FormInterface
108108
*/
109109
protected $taxClassMultiSelectList = ".//*[contains(@class, 'tax_%s_class')]//*[@class='block mselect-list']";
110110

111+
/**
112+
* Count of try for fill new tax class input.
113+
*/
114+
const MAX_TRY_COUNT = 3;
115+
111116
/**
112117
* Fill the root form.
113118
*
@@ -212,19 +217,38 @@ protected function addNewTaxClass(array $taxClasses, SimpleElement $element)
212217
foreach ($taxClasses as $taxClass) {
213218
$option = $element->find(sprintf($this->optionMaskElement, $taxClass), Locator::SELECTOR_XPATH);
214219
if (!$option->isVisible()) {
220+
$this->setNewTaxClassName($element, $taxClass);
221+
}
222+
}
223+
}
224+
225+
/**
226+
* Set new tax class name.
227+
*
228+
* @param SimpleElement $element
229+
* @param string $taxClass
230+
* @throws \Exception
231+
* @return void
232+
*/
233+
protected function setNewTaxClassName(SimpleElement $element, $taxClass)
234+
{
235+
$count = 0;
236+
do {
237+
try {
215238
$this->clickAddNewButton($element);
216-
$inputSelector = $this->addNewInput;
217-
$element->waitUntil(
218-
function () use ($element, $inputSelector) {
219-
$input = $element->find($inputSelector);
220-
return $input->isVisible() ? true : null;
221-
}
222-
);
223-
$element->find($this->addNewInput)->keys([$taxClass]);
239+
$input = $element->find($this->addNewInput);
240+
$input->click();
241+
$input->setValue($taxClass);
224242
$element->find($this->saveButton)->click();
225243
$this->waitUntilOptionIsVisible($element, $taxClass);
244+
return;
245+
} catch (\Exception $e) {
246+
// In parallel run on windows change the focus is lost on element
247+
$count++;
226248
}
227-
}
249+
} while ($count < self::MAX_TRY_COUNT);
250+
251+
throw new \Exception("Input for new tax class name isn't display.\n" . $e);
228252
}
229253

230254
/**
@@ -269,10 +293,9 @@ function () use ($browser) {
269293
*/
270294
protected function clickAddNewButton(SimpleElement $element)
271295
{
272-
$addNewButton = $this->addNewButton;
273296
$element->waitUntil(
274-
function () use ($element, $addNewButton) {
275-
return $element->find($addNewButton)->isVisible() ? true : null;
297+
function () use ($element) {
298+
return $element->find($this->addNewButton)->isVisible() ? true : null;
276299
}
277300
);
278301
$element->find($this->addNewButton)->click();

‎dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class CreateTaxRuleEntityTest extends Injectable
2929
const MVP = 'yes';
3030
const DOMAIN = 'CS';
3131
const TEST_TYPE = 'acceptance_test';
32-
const STABLE = 'no';
3332
/* end tags */
3433

3534
/**

‎dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ class TaxCalculationTest extends Scenario
3434
const DOMAIN = 'CS';
3535
/* end tags */
3636

37-
/**
38-
* Skip failed tests.
39-
*
40-
* @return void
41-
*/
42-
public static function setUpBeforeClass()
43-
{
44-
self::markTestIncomplete("Epic: MAGETWO-30073");
45-
}
46-
4737
/**
4838
* Runs tax calculation test.
4939
*

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<testCase name="Magento\Tax\Test\TestCase\TaxCalculationTest">
1010
<variation name="TaxCalculationTestVariation1">
1111
<data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax equals store tax and catalog price including tax</data>
12-
<data name="configData" xsi:type="string">row_cat_incl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
12+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
1313
<data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
1414
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
1515
<data name="catalogRule" xsi:type="string">-</data>
@@ -38,7 +38,7 @@
3838
</variation>
3939
<variation name="TaxCalculationTestVariation2">
4040
<data name="description" xsi:type="string">Simple product group price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
41-
<data name="configData" xsi:type="string">row_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
41+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
4242
<data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
4343
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
4444
<data name="catalogRule" xsi:type="string">-</data>
@@ -67,7 +67,7 @@
6767
</variation>
6868
<variation name="TaxCalculationTestVariation3">
6969
<data name="description" xsi:type="string">Simple product group price with sales rule, customer tax less than store tax and catalog price excluding tax</data>
70-
<data name="configData" xsi:type="string">total_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
70+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
7171
<data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
7272
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
7373
<data name="catalogRule" xsi:type="string">-</data>
@@ -96,7 +96,7 @@
9696
</variation>
9797
<variation name="TaxCalculationTestVariation4">
9898
<data name="description" xsi:type="string">Simple product special price with sales rule, customer tax less than store tax and catalog price including tax</data>
99-
<data name="configData" xsi:type="string">row_cat_incl_ship_excl_before_disc_on_incl, display_excluding_including_tax</data>
99+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, row_cat_incl_ship_excl_before_disc_on_incl, display_excluding_including_tax</data>
100100
<data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
101101
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
102102
<data name="catalogRule" xsi:type="string">-</data>
@@ -125,7 +125,7 @@
125125
</variation>
126126
<variation name="TaxCalculationTestVariation5">
127127
<data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax less than store tax and catalog price including tax</data>
128-
<data name="configData" xsi:type="string">unit_cat_incl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
128+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_incl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
129129
<data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
130130
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
131131
<data name="catalogRule" xsi:type="string">-</data>
@@ -154,7 +154,7 @@
154154
</variation>
155155
<variation name="TaxCalculationTestVariation6">
156156
<data name="description" xsi:type="string">Simple product special price with sales rule, customer tax equals store tax and catalog price excluding tax</data>
157-
<data name="configData" xsi:type="string">total_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
157+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_before_disc_on_incl, display_excluding_including_tax</data>
158158
<data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
159159
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
160160
<data name="catalogRule" xsi:type="string">-</data>
@@ -183,7 +183,7 @@
183183
</variation>
184184
<variation name="TaxCalculationTestVariation7">
185185
<data name="description" xsi:type="string">Simple product group price with sales rule, customer tax equals store tax and catalog price excluding tax</data>
186-
<data name="configData" xsi:type="string">unit_cat_excl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
186+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_excl_ship_excl_after_disc_on_excl, display_excluding_including_tax</data>
187187
<data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
188188
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
189189
<data name="catalogRule" xsi:type="string">-</data>
@@ -212,7 +212,7 @@
212212
</variation>
213213
<variation name="TaxCalculationTestVariation8">
214214
<data name="description" xsi:type="string">Simple product special price with sales rule, customer tax greater than store tax and catalog price including tax</data>
215-
<data name="configData" xsi:type="string">total_cat_incl_ship_excl_before_disc_on_excl, display_excluding_including_tax</data>
215+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_incl_ship_excl_before_disc_on_excl, display_excluding_including_tax</data>
216216
<data name="product" xsi:type="string">catalogProductSimple::simple_with_group_price_and_category</data>
217217
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
218218
<data name="catalogRule" xsi:type="string">-</data>
@@ -241,7 +241,7 @@
241241
</variation>
242242
<variation name="TaxCalculationTestVariation9">
243243
<data name="description" xsi:type="string">Simple product tier price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
244-
<data name="configData" xsi:type="string">total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax</data>
244+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, total_cat_excl_ship_incl_after_disc_on_incl, display_excluding_including_tax</data>
245245
<data name="product" xsi:type="string">catalogProductSimple::simple_with_tier_price_and_category</data>
246246
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
247247
<data name="catalogRule" xsi:type="string">-</data>
@@ -270,7 +270,7 @@
270270
</variation>
271271
<variation name="TaxCalculationTestVariation10">
272272
<data name="description" xsi:type="string">Simple product special price with sales rule, customer tax greater than store tax and catalog price excluding tax</data>
273-
<data name="configData" xsi:type="string">unit_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
273+
<data name="configData" xsi:type="string">shipping_tax_class_taxable_goods, unit_cat_excl_ship_incl_after_disc_on_excl, display_excluding_including_tax</data>
274274
<data name="product" xsi:type="string">catalogProductSimple::product_with_special_price_and_category</data>
275275
<data name="salesRule" xsi:type="string">active_sales_rule_for_all_groups_no_coupon</data>
276276
<data name="catalogRule" xsi:type="string">-</data>

‎dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class UpdateTaxRuleEntityTest extends Injectable
3333
/* tags */
3434
const MVP = 'yes';
3535
const DOMAIN = 'CS';
36-
const TO_MAINTAIN = 'yes';
3736
/* end tags */
3837

3938
/**

0 commit comments

Comments
 (0)