Skip to content

Commit 1668f78

Browse files
cparticacpartica
committed
Merge remote-tracking branch 'mainline/2.3.0-release' into 2.3.0-release-merge
2 parents 8460e4e + 48400ae commit 1668f78

File tree

29 files changed

+632
-836
lines changed

29 files changed

+632
-836
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<% if (data.items.length) { %>
4343
<% _.each(data.items, function(value){ %>
4444
<li class="item"
45-
<%- data.optionData(value) %>
45+
<%= data.optionData(value) %>
4646
>
4747
<a href="<%- value.url %>" class="title"><%- value.name %></a>
4848
<span class="type"><%- value.type %></span>

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<% } %>
1515
<ul data-mage-init='{"menu":[]}'>
1616
<% _.each(data.items, function(value) { %>
17-
<li <%- data.optionData(value) %>><a href="#"><%- value.label %></a></li>
17+
<li <%= data.optionData(value) %>><a href="#"><%- value.label %></a></li>
1818
<% }); %>
1919
</ul>
2020
<% if (!data.term && data.items.length && !data.allShown()) { %>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="MC-74"/>
1818
<group value="CatalogRule"/>
19-
<skip>
20-
<issueId value="DEVOPS-3618"/>
21-
</skip>
2219
</annotations>
2320
<before>
2421
<createData entity="ApiCategory" stepKey="createCategoryOne"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-65"/>
1919
<group value="CatalogRule"/>
20-
<skip>
21-
<issueId value="DEVOPS-3618"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<!-- Create the simple product and category that it will be in -->
@@ -77,9 +74,6 @@
7774
<severity value="MAJOR"/>
7875
<testCaseId value="MC-93"/>
7976
<group value="CatalogRule"/>
80-
<skip>
81-
<issueId value="DEVOPS-3618"/>
82-
</skip>
8377
</annotations>
8478
<before>
8579
<actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -103,9 +97,6 @@
10397
<severity value="MAJOR"/>
10498
<testCaseId value="MC-69"/>
10599
<group value="CatalogRule"/>
106-
<skip>
107-
<issueId value="DEVOPS-3618"/>
108-
</skip>
109100
</annotations>
110101
<before>
111102
<actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -129,9 +120,6 @@
129120
<severity value="MAJOR"/>
130121
<testCaseId value="MC-60"/>
131122
<group value="CatalogRule"/>
132-
<skip>
133-
<issueId value="DEVOPS-3618"/>
134-
</skip>
135123
</annotations>
136124
<before>
137125
<actionGroup stepKey="createNewPriceRule" ref="newCatalogPriceRuleByUI">
@@ -155,9 +143,6 @@
155143
<severity value="MAJOR"/>
156144
<testCaseId value="MC-71"/>
157145
<group value="CatalogRule"/>
158-
<skip>
159-
<issueId value="DEVOPS-3618"/>
160-
</skip>
161146
</annotations>
162147
<before>
163148
<!-- Create a simple product and a category-->

‎app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-160"/>
1919
<group value="CatalogRule"/>
20-
<skip>
21-
<issueId value="DEVOPS-3618"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-79"/>
1919
<group value="CatalogRule"/>
20-
<skip>
21-
<issueId value="DEVOPS-3618"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="login"/>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontCustomerOrderSection">
12+
<element name="isMyOrdersSection" type="text" selector="//*[@class='page-title']//*[contains(text(), 'My Orders')]"/>
1213
<element name="productCustomOptions" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[normalize-space(.)='{{var3}}']" parameterized="true"/>
1314
<element name="productCustomOptionsFile" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd[contains(.,'{{var3}}')]" parameterized="true"/>
1415
<element name="productCustomOptionsLink" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd//a[text() = '{{var3}}']" parameterized="true"/>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<element name="myOrdersTable" type="text" selector="#my-orders-table"/>
1414
<element name="subtotal" type="text" selector=".subtotal .amount"/>
1515
<element name="paymentMethod" type="text" selector=".payment-method dt"/>
16+
<element name="printOrderLink" type="text" selector="a.action.print" timeout="30"/>
1617
</section>
1718
</sections>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="CreateOrderToPrintPageActionGroup">
12+
<arguments>
13+
<argument name="Category"/>
14+
</arguments>
15+
<amOnPage url="{{StorefrontCategoryPage.url(Category.name)}}" stepKey="onCategoryPage"/>
16+
<waitForPageLoad stepKey="waitForPageLoad1"/>
17+
<moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
18+
<click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
19+
<waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
20+
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
21+
<click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
22+
<waitForPageLoad stepKey="waitForPageLoad2"/>
23+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
24+
<click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
25+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
26+
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
27+
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
28+
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
29+
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
30+
<click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
31+
<click selector="{{StorefrontCustomerOrderViewSection.printOrderLink}}" stepKey="clickPrintOrderLink"/>
32+
</actionGroup>
33+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomerSignOutPage.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11+
<page name="StorefrontCustomerSignOutPage" url="/customer/account/logout/" area="storefront" module="Magento_Customer"/>
12+
</pages>

0 commit comments

Comments
 (0)