Skip to content

Commit a989d56

Browse files
eugene-petroveugene-petrov
committed
Merge branch 'github-2.3-develop' into MAGETWO-64923
2 parents 6de4835 + 7120c6e commit a989d56

File tree

31 files changed

+169
-94
lines changed

31 files changed

+169
-94
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsChart.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
<test name="AdminDashboardWithChartsTest">
1212
<annotations>
1313
<features value="Backend"/>
14-
<stories value="Dashboard"/>
15-
<title value="Google chart on Magento dashboard"/>
16-
<description value="Google chart on Magento dashboard page is not broken"/>
14+
<stories value="Google Charts on Magento dashboard"/>
15+
<title value="Admin should see Google chart on Magento dashboard"/>
16+
<description value="Google chart on Magento dashboard page is displaying properly"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-98934"/>
1919
<useCaseId value="MAGETWO-98584"/>
2020
<group value="backend"/>
2121
</annotations>
2222
<before>
23-
<magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts" />
23+
<magentoCLI command="config:set admin/dashboard/enable_charts 1" stepKey="setEnableCharts"/>
2424
<createData entity="SimpleProduct2" stepKey="createProduct">
2525
<field key="price">150</field>
2626
</createData>
@@ -34,7 +34,7 @@
3434
<comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
3535
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
3636
<waitForLoadingMaskToDisappear stepKey="waitForLoadingOrderGrid"/>
37-
<magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault" />
37+
<magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
3838
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3939
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
4040
<actionGroup ref="logout" stepKey="logout"/>
@@ -48,7 +48,7 @@
4848
<!-- Login as customer -->
4949
<comment userInput="Login as customer" stepKey="loginAsCustomer"/>
5050
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
51-
<argument name="Customer" value="$$createCustomer$$" />
51+
<argument name="Customer" value="$$createCustomer$$"/>
5252
</actionGroup>
5353
<!-- Add Product to Shopping Cart-->
5454
<comment userInput="Add product to the shopping cart" stepKey="addProductToCart"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminLoginAfterJSMinificationTest">
1212
<annotations>
1313
<features value="Backend"/>
14-
<stories value="Login"/>
14+
<stories value="Admin Panel JS minification"/>
1515
<title value="Admin panel should be accessible with JS minification enabled"/>
1616
<description value="Admin panel should be accessible with JS minification enabled"/>
17-
<testCaseId value="MC-14104" />
17+
<testCaseId value="MC-14104"/>
1818
<severity value="MAJOR"/>
1919
<group value="backend"/>
2020
<group value="mtf_migrated"/>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminUserLoginWithStoreCodeInUrlTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<test name="AdminUserLoginWithStoreCodeInUrlTest">
1212
<annotations>
1313
<features value="Backend"/>
14-
<stories value="Login"/>
14+
<stories value="Admin Panel URL with Store Code"/>
1515
<title value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
1616
<description value="Admin panel should be accessible with Add Store Code to URL setting enabled"/>
17-
<testCaseId value="MC-14279" />
17+
<testCaseId value="MC-14279"/>
1818
<severity value="CRITICAL"/>
1919
<group value="backend"/>
2020
<group value="mtf_migrated"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<test name="AddOutOfStockProductToCompareListTest">
1212
<annotations>
1313
<features value="Catalog"/>
14-
<stories value="Compare List"/>
15-
<title value="Add out of stock product to compare list"/>
16-
<description value="Add out of stock product to compare list"/>
14+
<stories value="Product Comparison for products Out of Stock"/>
15+
<title value="Add Product that is Out of Stock product to Product Comparison"/>
16+
<description value="Customer should be able to add Product that is Out Of Stock to the Product Comparison"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-98644"/>
1919
<useCaseId value="MAGETWO-98522"/>
@@ -59,15 +59,15 @@
5959
<waitForPageLoad stepKey="waitForProdAddToCmpList"/>
6060
<!--Assert success message-->
6161
<comment userInput="Assert success message" stepKey="assertSuccessMsg"/>
62-
<grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage"/>
62+
<grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage"/>
6363
<assertEquals expected='You added product $$product.name$$ to the comparison list.' expectedType="string" actual="($grabTextFromSuccessMessage)" stepKey="assertSuccessMessage"/>
6464
<!--See product in the comparison list-->
6565
<comment userInput="See product in the comparison list" stepKey="seeProductInComparisonList"/>
6666
<amOnPage url="{{StorefrontProductComparePage.url}}" stepKey="navigateToComparePage"/>
6767
<waitForPageLoad stepKey="waitForStorefrontProductComparePageLoad"/>
6868
<seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName($product.name$)}}" stepKey="seeProductInCompareList"/>
6969
<!--Go to Category page and delete product from comparison list-->
70-
<comment userInput="Go to Category page and delete prduct from comparison list" stepKey="deletProdFromCmpList"/>
70+
<comment userInput="Go to Category page and delete product from comparison list" stepKey="deleteProdFromCmpList"/>
7171
<amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="onCategoryPage"/>
7272
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
7373
<click selector="{{StorefrontComparisonSidebarSection.ClearAll}}" stepKey="clickClearAll"/>
@@ -81,7 +81,7 @@
8181
<waitForPageLoad stepKey="waitProdAddingToCmpList"/>
8282
<!--Assert success message-->
8383
<comment userInput="Assert success message" stepKey="assertSuccessMsg2"/>
84-
<grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage2"/>
84+
<grabTextFrom selector="{{AdminProductMessagesSection.successMessage}}" stepKey="grabTextFromSuccessMessage2"/>
8585
<assertEquals expected='You added product $$product.name$$ to the comparison list.' expectedType="string" actual="($grabTextFromSuccessMessage)" stepKey="assertSuccessMessage2"/>
8686
<!--Check that product displays on add to compare widget-->
8787
<comment userInput="Check that product displays on add to compare widget" stepKey="checkProdNameOnWidget"/>

‎app/code/Magento/Catalog/etc/crontab.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<job name="catalog_product_outdated_price_values_cleanup" instance="Magento\Catalog\Cron\DeleteOutdatedPriceValues" method="execute">
1717
<schedule>* * * * *</schedule>
1818
</job>
19-
<job name="catalog_product_frontend_actions_flush" instance="Magento\Catalog\Cron\DeleteOutdatedPriceValues" method="execute">
19+
<job name="catalog_product_frontend_actions_flush" instance="Magento\Catalog\Cron\FrontendActionsFlush" method="execute">
2020
<schedule>* * * * *</schedule>
2121
</job>
2222
<job name="catalog_product_attribute_value_synchronize" instance="Magento\Catalog\Cron\SynchronizeWebsiteAttributes" method="execute">

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontValidateEmailOnCheckoutTest.xml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
<test name="StorefrontValidateEmailOnCheckoutTest">
1212
<annotations>
1313
<features value="Checkout"/>
14-
<title value="Email validation for Guest on checkout flow"/>
15-
<description value="Email validation for Guest on checkout flow"/>
14+
<stories value="Guest Checkout e-mail validation"/>
15+
<title value="Guest e-mail address validation on Checkout process"/>
16+
<description value="Guest should not be able to place an order when invalid e-mail address provided"/>
1617
<stories value="Guest Checkout"/>
17-
<testCaseId value="MC-14695" />
18+
<testCaseId value="MC-14695"/>
1819
<severity value="CRITICAL"/>
1920
<group value="checkout"/>
2021
<group value="shoppingCart"/>
@@ -29,27 +30,27 @@
2930
</after>
3031

3132
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
32-
<argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$" />
33+
<argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/>
3334
</actionGroup>
34-
<actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage" />
35+
<actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
3536

36-
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage" />
37-
<actionGroup ref="AssertStorefrontEmailTooltipContentOnCheckoutActionGroup" stepKey="assertEmailTooltipContent" />
38-
<actionGroup ref="AssertStorefrontEmailNoteMessageOnCheckoutActionGroup" stepKey="assertEmailNoteMessage" />
37+
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
38+
<actionGroup ref="AssertStorefrontEmailTooltipContentOnCheckoutActionGroup" stepKey="assertEmailTooltipContent"/>
39+
<actionGroup ref="AssertStorefrontEmailNoteMessageOnCheckoutActionGroup" stepKey="assertEmailNoteMessage"/>
3940

4041
<actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailFirstAttempt">
41-
<argument name="email" value="John" />
42+
<argument name="email" value="John"/>
4243
</actionGroup>
43-
<actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageFirstAttempt" />
44+
<actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageFirstAttempt"/>
4445

4546
<actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailSecondAttempt">
46-
<argument name="email" value="johndoe#example.com" />
47+
<argument name="email" value="johndoe#example.com"/>
4748
</actionGroup>
48-
<actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageSecondAttempt" />
49+
<actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageSecondAttempt"/>
4950

5051
<actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillIncorrectEmailThirdAttempt">
51-
<argument name="email" value="johndoe@example.c" />
52+
<argument name="email" value="johndoe@example.c"/>
5253
</actionGroup>
53-
<actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageThirdAttempt" />
54+
<actionGroup ref="AssertStorefrontEmailValidationMessageOnCheckoutActionGroup" stepKey="verifyValidationErrorMessageThirdAttempt"/>
5455
</test>
5556
</tests>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@
285285
<settings>
286286
<validation>
287287
<rule name="validate-date" xsi:type="boolean">true</rule>
288+
<rule name="validate-date-range" xsi:type="string">custom_theme_from</rule>
288289
</validation>
289290
<dataType>text</dataType>
290291
<label translate="true">To</label>

‎app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AllowedCountriesRestrictionApplyOnBackendTest">
1111
<annotations>
12+
<features value="Customer"/>
1213
<stories value="Country filter"/>
1314
<title value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
1415
<description value="Country filter on Customers page when allowed countries restriction for a default website is applied"/>
15-
<features value="Customer"/>
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-6441"/>
1818
<useCaseId value="MAGETWO-91523"/>

‎app/code/Magento/Customer/Test/Mftf/Test/DeleteCustomerGroupTest.xml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="DeleteCustomerGroupTest">
1212
<annotations>
13-
<title value="Delete customer group entity test"/>
14-
<description value="Delete a customer group"/>
13+
<features value="Customer"/>
1514
<stories value="Delete Customer Group"/>
16-
<testCaseId value="MC-14590" />
15+
<title value="Delete Customer Group in Admin Panel"/>
16+
<description value="Admin should be able to delete a Customer Group"/>
17+
<testCaseId value="MC-14590"/>
1718
<severity value="MAJOR"/>
1819
<group value="customers"/>
1920
<group value="mtf_migrated"/>
2021
</annotations>
2122

2223
<before>
23-
<createData entity="CustomCustomerGroup" stepKey="customerGroup" />
24+
<createData entity="CustomCustomerGroup" stepKey="customerGroup"/>
2425
<createData entity="UsCustomerAssignedToNewCustomerGroup" stepKey="customer">
25-
<requiredEntity createDataKey="customerGroup" />
26+
<requiredEntity createDataKey="customerGroup"/>
2627
</createData>
2728
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2829
</before>
@@ -36,21 +37,21 @@
3637
<argument name="customerGroupName" value="$$customerGroup.code$$"/>
3738
</actionGroup>
3839
<actionGroup ref="AssertCustomerGroupNotInGridActionGroup" stepKey="assertCustomerGroupNotInGrid">
39-
<argument name="customerGroup" value="$$customerGroup$$" />
40+
<argument name="customerGroup" value="$$customerGroup$$"/>
4041
</actionGroup>
4142

4243
<actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
43-
<argument name="customerId" value="$$customer.id$$" />
44+
<argument name="customerId" value="$$customer.id$$"/>
4445
</actionGroup>
4546

4647
<actionGroup ref="AssertCustomerGroupOnCustomerFormActionGroup" stepKey="assertCustomerGroupOnCustomerForm">
47-
<argument name="customerGroup" value="GeneralCustomerGroup" />
48+
<argument name="customerGroup" value="GeneralCustomerGroup"/>
4849
</actionGroup>
49-
50-
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openNewProductForm" />
51-
50+
51+
<actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openNewProductForm"/>
52+
5253
<actionGroup ref="AssertCustomerGroupNotOnProductFormActionGroup" stepKey="assertCustomerGroupNotOnProductForm">
53-
<argument name="customerGroup" value="$$customerGroup$$" />
54+
<argument name="customerGroup" value="$$customerGroup$$"/>
5455
</actionGroup>
5556
</test>
5657
</tests>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateExistingCustomerTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="StorefrontCreateExistingCustomerTest">
1212
<annotations>
1313
<features value="Customer"/>
14-
<stories value="Create a Customer via the Storefront"/>
14+
<stories value="Customer Registration"/>
1515
<title value="Attempt to register customer on storefront with existing email"/>
1616
<description value="Attempt to register customer on storefront with existing email"/>
17-
<testCaseId value="MC-10907" />
17+
<testCaseId value="MC-10907"/>
1818
<severity value="MAJOR"/>
1919
<group value="customers"/>
2020
<group value="mtf_migrated"/>

0 commit comments

Comments
 (0)