Skip to content

Commit 187dc00

Browse files
author
Dmytro Aponasenko
committed
MTA-2431: Deliver Unicorns Sprint 26 results
1 parent 353d388 commit 187dc00

File tree

8 files changed

+186
-187
lines changed

8 files changed

+186
-187
lines changed

‎dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
use Magento\Mtf\Constraint\AbstractConstraint;
1111

1212
/**
13-
* Class AssertCatalogPriceRuleNoticeMessage
13+
* Assert notice message after saving catalog price rule.
1414
*/
1515
class AssertCatalogPriceRuleNoticeMessage extends AbstractConstraint
1616
{
1717
const NOTICE_MESSAGE_RULES = 'We found updated rules that are not applied.';
18-
const NOTICE_MESSAGE_APPLY = ' Please, click Apply Rules in order to see immediate effect in the catalog.';
18+
const NOTICE_MESSAGE_APPLY = ' Please click "Apply Rules" to update your catalog.';
1919

2020
/**
2121
* Assert that message "We found updated rules that are not applied..."

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@
1010
use Magento\Mtf\Constraint\AbstractConstraint;
1111

1212
/**
13-
* Class AssertSearchTermSuccessMassDeleteMessage
14-
* Assert that success message is displayed after search terms were mass deleted
13+
* Assert that success message is displayed after search terms were mass deleted.
1514
*/
1615
class AssertSearchTermSuccessMassDeleteMessage extends AbstractConstraint
1716
{
1817
/**
1918
* Text value to be checked
2019
*/
21-
const SUCCESS_MESSAGE = 'Total of %d record(s) were deleted';
20+
const SUCCESS_MESSAGE = 'Total of %d record(s) were deleted.';
2221

2322
/**
24-
* Assert that success message is displayed after search terms were mass deleted
23+
* Assert that success message is displayed after search terms were mass deleted.
2524
*
2625
* @param array $searchTerms
2726
* @param CatalogSearchIndex $indexPage
@@ -39,7 +38,7 @@ public function processAssert(array $searchTerms, CatalogSearchIndex $indexPage)
3938
}
4039

4140
/**
42-
* Returns a string representation of the object
41+
* Returns a string representation of the object.
4342
*
4443
* @return string
4544
*/

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/AbstractCartItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class AbstractCartItem extends Block
4040
*
4141
* @var string
4242
*/
43-
protected $qty = './/input[@type="number" and @title="Quantity"]';
43+
protected $qty = './/input[@data-role="cart-item-qty"]';
4444

4545
/**
4646
* Cart item sub-total xpath selector

‎dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest.xml

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,54 @@
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\Reports\Test\TestCase\SalesCouponReportEntityTest">
10-
<variation name="SalesCouponReportEntityTestVariation1">
11-
<data name="order/dataSet" xsi:type="string">with_coupon</data>
12-
<data name="viewsReport/report_type" xsi:type="string">Order Created Date</data>
13-
<data name="viewsReport/period_type" xsi:type="string">Year</data>
14-
<data name="viewsReport/from" xsi:type="string">m/d/Y</data>
15-
<data name="viewsReport/to" xsi:type="string">m/d/Y</data>
16-
<data name="viewsReport/show_order_statuses" xsi:type="string">Any</data>
17-
<data name="viewsReport/show_empty_rows" xsi:type="string">No</data>
18-
<data name="viewsReport/price_rule_type" xsi:type="string">Any</data>
19-
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult"/>
20-
</variation>
21-
<variation name="SalesCouponReportEntityTestVariation2">
22-
<data name="order/dataSet" xsi:type="string">with_coupon</data>
23-
<data name="viewsReport/report_type" xsi:type="string">Order Created Date</data>
24-
<data name="viewsReport/period_type" xsi:type="string">Month</data>
25-
<data name="viewsReport/from" xsi:type="string">m/d/Y</data>
26-
<data name="viewsReport/to" xsi:type="string">m/d/Y</data>
27-
<data name="viewsReport/show_order_statuses" xsi:type="string">Specified</data>
28-
<data name="viewsReport/order_statuses" xsi:type="string">Processing</data>
29-
<data name="viewsReport/show_empty_rows" xsi:type="string">No</data>
30-
<data name="viewsReport/price_rule_type" xsi:type="string">Any</data>
31-
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult"/>
32-
</variation>
33-
<variation name="SalesCouponReportEntityTestVariation3">
34-
<data name="order/dataSet" xsi:type="string">with_coupon</data>
35-
<data name="viewsReport/report_type" xsi:type="string">Order Updated Date</data>
36-
<data name="viewsReport/period_type" xsi:type="string">Day</data>
37-
<data name="viewsReport/from" xsi:type="string">m/d/Y</data>
38-
<data name="viewsReport/to" xsi:type="string">m/d/Y</data>
39-
<data name="viewsReport/show_order_statuses" xsi:type="string">Any</data>
40-
<data name="viewsReport/show_empty_rows" xsi:type="string">No</data>
41-
<data name="viewsReport/price_rule_type" xsi:type="string">Specified</data>
42-
<data name="viewsReport/rules_list" xsi:type="string">%rule_name%</data>
43-
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult"/>
44-
</variation>
45-
<variation name="SalesCouponReportEntityTestVariation4">
46-
<data name="order/dataSet" xsi:type="string">with_coupon</data>
47-
<data name="viewsReport/report_type" xsi:type="string">Order Updated Date</data>
48-
<data name="viewsReport/period_type" xsi:type="string">Day</data>
49-
<data name="viewsReport/from" xsi:type="string">m/d/Y 12:00 a-1 day</data>
50-
<data name="viewsReport/to" xsi:type="string">m/d/Y 12:00 a+1 day</data>
51-
<data name="viewsReport/show_order_statuses" xsi:type="string">Specified</data>
52-
<data name="viewsReport/order_statuses" xsi:type="string">Processing</data>
53-
<data name="viewsReport/show_empty_rows" xsi:type="string">Yes</data>
54-
<data name="viewsReport/price_rule_type" xsi:type="string">Specified</data>
55-
<data name="viewsReport/rules_list" xsi:type="string">%rule_name%</data>
56-
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult"/>
57-
</variation>
58-
</testCase>
9+
<testCase name="Magento\Reports\Test\TestCase\SalesCouponReportEntityTest">
10+
<variation name="SalesCouponReportEntityTestVariation1">
11+
<data name="order/dataSet" xsi:type="string">with_coupon</data>
12+
<data name="viewsReport/report_type" xsi:type="string">Order Created</data>
13+
<data name="viewsReport/period_type" xsi:type="string">Year</data>
14+
<data name="viewsReport/from" xsi:type="string">m/d/Y</data>
15+
<data name="viewsReport/to" xsi:type="string">m/d/Y</data>
16+
<data name="viewsReport/show_order_statuses" xsi:type="string">Any</data>
17+
<data name="viewsReport/show_empty_rows" xsi:type="string">No</data>
18+
<data name="viewsReport/price_rule_type" xsi:type="string">Any</data>
19+
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult" />
20+
</variation>
21+
<variation name="SalesCouponReportEntityTestVariation2">
22+
<data name="order/dataSet" xsi:type="string">with_coupon</data>
23+
<data name="viewsReport/report_type" xsi:type="string">Order Created</data>
24+
<data name="viewsReport/period_type" xsi:type="string">Month</data>
25+
<data name="viewsReport/from" xsi:type="string">m/d/Y</data>
26+
<data name="viewsReport/to" xsi:type="string">m/d/Y</data>
27+
<data name="viewsReport/show_order_statuses" xsi:type="string">Specified</data>
28+
<data name="viewsReport/order_statuses" xsi:type="string">Processing</data>
29+
<data name="viewsReport/show_empty_rows" xsi:type="string">No</data>
30+
<data name="viewsReport/price_rule_type" xsi:type="string">Any</data>
31+
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult" />
32+
</variation>
33+
<variation name="SalesCouponReportEntityTestVariation3">
34+
<data name="order/dataSet" xsi:type="string">with_coupon</data>
35+
<data name="viewsReport/report_type" xsi:type="string">Order Updated</data>
36+
<data name="viewsReport/period_type" xsi:type="string">Day</data>
37+
<data name="viewsReport/from" xsi:type="string">m/d/Y</data>
38+
<data name="viewsReport/to" xsi:type="string">m/d/Y</data>
39+
<data name="viewsReport/show_order_statuses" xsi:type="string">Any</data>
40+
<data name="viewsReport/show_empty_rows" xsi:type="string">No</data>
41+
<data name="viewsReport/price_rule_type" xsi:type="string">Specified</data>
42+
<data name="viewsReport/rules_list" xsi:type="string">%rule_name%</data>
43+
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult" />
44+
</variation>
45+
<variation name="SalesCouponReportEntityTestVariation4">
46+
<data name="order/dataSet" xsi:type="string">with_coupon</data>
47+
<data name="viewsReport/report_type" xsi:type="string">Order Updated</data>
48+
<data name="viewsReport/period_type" xsi:type="string">Day</data>
49+
<data name="viewsReport/from" xsi:type="string">m/d/Y 12:00 a-1 day</data>
50+
<data name="viewsReport/to" xsi:type="string">m/d/Y 12:00 a+1 day</data>
51+
<data name="viewsReport/show_order_statuses" xsi:type="string">Specified</data>
52+
<data name="viewsReport/order_statuses" xsi:type="string">Processing</data>
53+
<data name="viewsReport/show_empty_rows" xsi:type="string">Yes</data>
54+
<data name="viewsReport/price_rule_type" xsi:type="string">Specified</data>
55+
<data name="viewsReport/rules_list" xsi:type="string">%rule_name%</data>
56+
<constraint name="Magento\Reports\Test\Constraint\AssertCouponReportResult" />
57+
</variation>
58+
</testCase>
5959
</config>

‎dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<variation name="SalesInvoiceReportEntityTestVariation1">
1111
<data name="order/dataSet" xsi:type="string">default</data>
1212
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
13-
<data name="invoiceReport/report_type" xsi:type="string">Order Created Date</data>
13+
<data name="invoiceReport/report_type" xsi:type="string">Order Created</data>
1414
<data name="invoiceReport/period_type" xsi:type="string">Year</data>
1515
<data name="invoiceReport/from" xsi:type="string">m/d/Y 12:00 a-2 days</data>
1616
<data name="invoiceReport/to" xsi:type="string">m/d/Y 12:00 a+2 days</data>
@@ -22,7 +22,7 @@
2222
<variation name="SalesInvoiceReportEntityTestVariation2">
2323
<data name="order/dataSet" xsi:type="string">default</data>
2424
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
25-
<data name="invoiceReport/report_type" xsi:type="string">Order Created Date</data>
25+
<data name="invoiceReport/report_type" xsi:type="string">Order Created</data>
2626
<data name="invoiceReport/period_type" xsi:type="string">Month</data>
2727
<data name="invoiceReport/from" xsi:type="string">m/d/Y</data>
2828
<data name="invoiceReport/to" xsi:type="string">m/d/Y</data>

‎dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,46 +6,46 @@
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\Reports\Test\TestCase\SalesOrderReportEntityTest">
10-
<variation name="SalesOrderReportEntityTestVariation1">
11-
<data name="order/dataSet" xsi:type="string">default</data>
12-
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
13-
<data name="salesReport/report_type" xsi:type="string">Order Created Date</data>
14-
<data name="salesReport/period_type" xsi:type="string">Year</data>
15-
<data name="salesReport/from" xsi:type="string">m/d/Y 12:00 a-2 days</data>
16-
<data name="salesReport/to" xsi:type="string">m/d/Y 12:00 a+2 days</data>
17-
<data name="salesReport/show_order_statuses" xsi:type="string">Any</data>
18-
<data name="salesReport/show_empty_rows" xsi:type="string">Yes</data>
19-
<data name="salesReport/show_actual_columns" xsi:type="string">Yes</data>
20-
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult"/>
21-
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult"/>
22-
</variation>
23-
<variation name="SalesOrderReportEntityTestVariation2">
24-
<data name="order/dataSet" xsi:type="string">default</data>
25-
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
26-
<data name="salesReport/report_type" xsi:type="string">Order Created Date</data>
27-
<data name="salesReport/period_type" xsi:type="string">Month</data>
28-
<data name="salesReport/from" xsi:type="string">m/d/Y</data>
29-
<data name="salesReport/to" xsi:type="string">m/d/Y</data>
30-
<data name="salesReport/show_order_statuses" xsi:type="string">Any</data>
31-
<data name="salesReport/show_empty_rows" xsi:type="string">No</data>
32-
<data name="salesReport/show_actual_columns" xsi:type="string">No</data>
33-
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult"/>
34-
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult"/>
35-
</variation>
36-
<variation name="SalesOrderReportEntityTestVariation3">
37-
<data name="order/dataSet" xsi:type="string">default</data>
38-
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
39-
<data name="salesReport/report_type" xsi:type="string">Order Updated Date</data>
40-
<data name="salesReport/period_type" xsi:type="string">Day</data>
41-
<data name="salesReport/from" xsi:type="string">m/d/Y</data>
42-
<data name="salesReport/to" xsi:type="string">m/d/Y</data>
43-
<data name="salesReport/show_order_statuses" xsi:type="string">Specified</data>
44-
<data name="salesReport/order_statuses" xsi:type="string">Processing</data>
45-
<data name="salesReport/show_empty_rows" xsi:type="string">No</data>
46-
<data name="salesReport/show_actual_columns" xsi:type="string">No</data>
47-
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult"/>
48-
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult"/>
49-
</variation>
50-
</testCase>
9+
<testCase name="Magento\Reports\Test\TestCase\SalesOrderReportEntityTest">
10+
<variation name="SalesOrderReportEntityTestVariation1">
11+
<data name="order/dataSet" xsi:type="string">default</data>
12+
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
13+
<data name="salesReport/report_type" xsi:type="string">Order Created</data>
14+
<data name="salesReport/period_type" xsi:type="string">Year</data>
15+
<data name="salesReport/from" xsi:type="string">m/d/Y 12:00 a-2 days</data>
16+
<data name="salesReport/to" xsi:type="string">m/d/Y 12:00 a+2 days</data>
17+
<data name="salesReport/show_order_statuses" xsi:type="string">Any</data>
18+
<data name="salesReport/show_empty_rows" xsi:type="string">Yes</data>
19+
<data name="salesReport/show_actual_columns" xsi:type="string">Yes</data>
20+
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult" />
21+
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
22+
</variation>
23+
<variation name="SalesOrderReportEntityTestVariation2">
24+
<data name="order/dataSet" xsi:type="string">default</data>
25+
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
26+
<data name="salesReport/report_type" xsi:type="string">Order Created</data>
27+
<data name="salesReport/period_type" xsi:type="string">Month</data>
28+
<data name="salesReport/from" xsi:type="string">m/d/Y</data>
29+
<data name="salesReport/to" xsi:type="string">m/d/Y</data>
30+
<data name="salesReport/show_order_statuses" xsi:type="string">Any</data>
31+
<data name="salesReport/show_empty_rows" xsi:type="string">No</data>
32+
<data name="salesReport/show_actual_columns" xsi:type="string">No</data>
33+
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult" />
34+
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
35+
</variation>
36+
<variation name="SalesOrderReportEntityTestVariation3">
37+
<data name="order/dataSet" xsi:type="string">default</data>
38+
<data name="order/data/price/preset" xsi:type="string">full_invoice</data>
39+
<data name="salesReport/report_type" xsi:type="string">Order Updated</data>
40+
<data name="salesReport/period_type" xsi:type="string">Day</data>
41+
<data name="salesReport/from" xsi:type="string">m/d/Y</data>
42+
<data name="salesReport/to" xsi:type="string">m/d/Y</data>
43+
<data name="salesReport/show_order_statuses" xsi:type="string">Specified</data>
44+
<data name="salesReport/order_statuses" xsi:type="string">Processing</data>
45+
<data name="salesReport/show_empty_rows" xsi:type="string">No</data>
46+
<data name="salesReport/show_actual_columns" xsi:type="string">No</data>
47+
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportIntervalResult" />
48+
<constraint name="Magento\Reports\Test\Constraint\AssertSalesReportTotalResult" />
49+
</variation>
50+
</testCase>
5151
</config>

0 commit comments

Comments
 (0)