Skip to content

Commit 6c391df

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

File tree

11 files changed

+108
-74
lines changed

11 files changed

+108
-74
lines changed

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertProductCustomOptionsOnBundleProductPage.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
use Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage;
1010

1111
/**
12-
* Class AssertProductCustomOptionsOnBundleProductPage
13-
* Assertion that commodity options are displayed correctly on bundle product page
12+
* Assertion that commodity options are displayed correctly on bundle product page.
1413
*/
1514
class AssertProductCustomOptionsOnBundleProductPage extends AssertProductCustomOptionsOnProductPage
1615
{

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AssertTierPriceOnBundleProductPage extends AssertProductTierPriceOnProduct
3232
*
3333
* @var int
3434
*/
35-
protected $priceFormat = 4;
35+
protected $priceFormat = 0;
3636

3737
/**
3838
* Assertion that tier prices are displayed correctly

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct/Price.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ public function getPreset()
139139
'price_to' => '120.00',
140140
],
141141
'fixed-115' => [
142-
'price_from' => '115.00',
143-
'price_to' => '120.00',
142+
'price_from' => '317.00',
143+
'price_to' => '362.00',
144144
'cart_price' => '317.00',
145145
],
146-
'fixed-159' => [
147-
'price_from' => '115.00',
148-
'price_to' => '120.00',
146+
'fixed-110' => [
147+
'price_from' => '159.00',
148+
'price_to' => '164.00',
149149
'cart_price' => '159.00',
150150
],
151151
'fixed-756' => [

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@
228228
<constraint name="Magento\Bundle\Test\Constraint\AssertBundlePriceType" />
229229
</variation>
230230
<variation name="CreateBundleProductEntityTestVariation10">
231-
<data name="tag" xsi:type="string">to_maintain:yes</data>
232231
<data name="description" xsi:type="string">Create dynamic bundle</data>
233232
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
234233
<data name="product/data/name" xsi:type="string">Bundle Dynamic %isolation%</data>
@@ -272,7 +271,7 @@
272271
<data name="product/data/sku" xsi:type="string">sku_bundle_fixed_%isolation%</data>
273272
<data name="product/data/price_type" xsi:type="string">Fixed</data>
274273
<data name="product/data/price/value" xsi:type="string">110</data>
275-
<data name="product/data/price/preset" xsi:type="string">fixed-159</data>
274+
<data name="product/data/price/preset" xsi:type="string">fixed-110</data>
276275
<data name="product/data/bundle_selections/preset" xsi:type="string">second</data>
277276
<data name="product/data/bundle_selections/products" xsi:type="string">catalogProductSimple::product_100_dollar,catalogProductSimple::product_40_dollar</data>
278277
<data name="product/data/checkout_data/preset" xsi:type="string">with_custom_options_2</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductVirtual.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,23 @@
3636
</field>
3737
</dataset>
3838

39+
<dataset name="required_fields">
40+
<field name="url_key" xsi:type="string">virtual-product%isolation%</field>
41+
<field name="name" xsi:type="string">Virtual product %isolation%</field>
42+
<field name="sku" xsi:type="string">sku_virtual_product_%isolation%</field>
43+
<field name="is_virtual" xsi:type="string">Yes</field>
44+
<field name="price" xsi:type="array">
45+
<item name="value" xsi:type="string">10</item>
46+
<item name="preset" xsi:type="string">-</item>
47+
</field>
48+
<field name="tax_class_id" xsi:type="array">
49+
<item name="dataSet" xsi:type="string">taxable_goods</item>
50+
</field>
51+
<field name="website_ids" xsi:type="array">
52+
<item name="0" xsi:type="string">Main Website</item>
53+
</field>
54+
</dataset>
55+
3956
<dataset name="required_fields_with_category">
4057
<field name="url_key" xsi:type="string">virtual-product%isolation%</field>
4158
<field name="name" xsi:type="string">Virtual product %isolation%</field>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
</variation>
2828
<variation name="ProductTypeSwitchingOnCreationTestVariation3">
2929
<data name="createProduct" xsi:type="string">configurable</data>
30-
<data name="product" xsi:type="string">catalogProductSimple::default</data>
30+
<data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
3131
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
3232
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
3333
</variation>
3434
<variation name="ProductTypeSwitchingOnCreationTestVariation4">
3535
<data name="createProduct" xsi:type="string">configurable</data>
36-
<data name="product" xsi:type="string">catalogProductVirtual::default</data>
36+
<data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
3737
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
3838
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
3939
</variation>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
</variation>
2929
<variation name="ProductTypeSwitchingOnUpdateTestVariation3">
3030
<data name="productOrigin" xsi:type="string">configurableProduct::default</data>
31-
<data name="product" xsi:type="string">catalogProductSimple::default</data>
31+
<data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
3232
<data name="actionName" xsi:type="string">deleteAttributes</data>
3333
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
3434
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
3535
</variation>
3636
<variation name="ProductTypeSwitchingOnUpdateTestVariation4">
3737
<data name="productOrigin" xsi:type="string">configurableProduct::default</data>
38-
<data name="product" xsi:type="string">catalogProductVirtual::default</data>
38+
<data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
3939
<data name="actionName" xsi:type="string">deleteAttributes</data>
4040
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
4141
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />

‎dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.php

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,56 @@
88

99
use Magento\Mtf\Block\Form;
1010
use Magento\Mtf\Client\Locator;
11+
use Magento\Mtf\Fixture\FixtureInterface;
12+
use Magento\Mtf\Client\Element\SimpleElement;
1113

1214
/**
13-
* Class Edit
14-
* Review edit form
15+
* Review edit form.
1516
*/
1617
class ReviewForm extends Form
1718
{
1819
/**
19-
* Posted by field
20+
* Posted by field.
2021
*
2122
* @var string
2223
*/
2324
protected $customer = '#customer';
2425

2526
/**
26-
* Rating status
27+
* Rating status.
2728
*
2829
* @var string
2930
*/
3031
protected $status = '[name=status_id]';
3132

3233
/**
33-
* 'Save Review' button
34+
* 'Save Review' button.
3435
*
3536
* @var string
3637
*/
3738
protected $saveButton = '[data-ui-id$=save-button-button]';
3839

3940
/**
40-
* Get data from 'Posted By' field
41+
* Fill the review form.
42+
*
43+
* @param FixtureInterface $fixture
44+
* @param SimpleElement|null $element
45+
* @return $this
46+
*/
47+
public function fill(FixtureInterface $fixture, SimpleElement $element = null)
48+
{
49+
$data = $fixture->getData();
50+
if (isset($data['entity_id'])) {
51+
unset($data['entity_id']);
52+
}
53+
$mapping = $this->dataMapping($data);
54+
$this->_fill($mapping, $element);
55+
56+
return $this;
57+
}
58+
59+
/**
60+
* Get data from 'Posted By' field.
4161
*
4262
* @return string
4363
*/
@@ -47,7 +67,7 @@ public function getPostedBy()
4767
}
4868

4969
/**
50-
* Get data from Status field
70+
* Get data from Status field.
5171
*
5272
* @return string
5373
*/
@@ -57,7 +77,7 @@ public function getStatus()
5777
}
5878

5979
/**
60-
* Set approve review
80+
* Set approve review.
6181
*
6282
* @return void
6383
*/

‎dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewForm.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="1">
8+
<mapping strict="0">
99
<fields>
1010
<status_id>
1111
<input>select</input>

‎dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
use Magento\Mtf\Fixture\FixtureInterface;
1313

1414
/**
15-
* Class AssertProductReviewInGrid
16-
* Check that review is displayed in grid
15+
* Check that review is displayed in grid.
1716
*/
1817
class AssertProductReviewInGrid extends AbstractConstraint
1918
{
2019
/**
21-
* Filter params
20+
* Filter params.
2221
*
2322
* @var array
2423
*/
@@ -35,10 +34,10 @@ class AssertProductReviewInGrid extends AbstractConstraint
3534
];
3635

3736
/**
38-
* Assert that review is displayed in grid
37+
* Assert that review is displayed in grid.
3938
*
4039
* @param ReviewIndex $reviewIndex
41-
* @param Review $review ,
40+
* @param Review $review
4241
* @param FixtureInterface $product
4342
* @param string $gridStatus
4443
* @return void
@@ -61,7 +60,7 @@ public function processAssert(
6160
}
6261

6362
/**
64-
* Prepare filter for assert
63+
* Prepare filter for assert.
6564
*
6665
* @param FixtureInterface $product
6766
* @param array $review
@@ -89,6 +88,9 @@ public function prepareFilter(FixtureInterface $product, array $review, $gridSta
8988
case 'status_id':
9089
$value = $gridStatus != '' ? $gridStatus : (isset($review[$param]) ? $review[$param] : null);
9190
break;
91+
case 'type':
92+
$value = isset($review[$param]) ? $review[$param] : 'Administrator';
93+
break;
9294
default:
9395
$value = isset($review[$param]) ? $review[$param] : null;
9496
break;
@@ -101,7 +103,7 @@ public function prepareFilter(FixtureInterface $product, array $review, $gridSta
101103
}
102104

103105
/**
104-
* Text success exist review in grid on product reviews tab
106+
* Text success exist review in grid on product reviews tab.
105107
*
106108
* @return string
107109
*/

0 commit comments

Comments
 (0)