Skip to content

Commit 5bce52d

Browse files
author
Yevhen Miroshnychenko
committed
Merge branch '2.3-develop' into MAGETWO-72760
2 parents 0f6aa60 + 5a7af9e commit 5bce52d

35 files changed

+594
-136
lines changed

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@
106106
.lib-dropdown(
107107
@_toggle-selector: ~'.action.showcart',
108108
@_options-selector: ~'.block-minicart',
109+
@_dropdown-list-width: 320px,
110+
@_dropdown-list-position-right: 0px,
111+
@_dropdown-list-pointer-position: right,
112+
@_dropdown-list-pointer-position-left-right: 26px,
113+
@_dropdown-list-z-index: 101,
109114
@_dropdown-toggle-icon-content: @icon-cart,
110115
@_dropdown-toggle-active-icon-content: @icon-cart,
111116
@_dropdown-list-item-padding: false,
@@ -121,23 +126,10 @@
121126

122127
.block-minicart {
123128
.lib-css(padding, 25px @minicart__padding-horizontal);
124-
right: 0;
125-
width: 320px;
126-
z-index: 101;
127129

128130
.block-title {
129131
display: none;
130132
}
131-
132-
&:after {
133-
left: auto;
134-
right: 25px;
135-
}
136-
137-
&:before {
138-
left: auto;
139-
right: 26px;
140-
}
141133
}
142134

143135
.product {

‎app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@
162162
.lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
163163
}
164164

165+
.step-title {
166+
.lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
167+
.lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
168+
}
169+
165170
.payment-method-title {
166171
.lib-css(padding, @checkout-payment-method-title-mobile__padding)
167172
}

‎app/design/frontend/Magento/blank/web/css/source/_navigation.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
.switcher {
9494
border-top: 1px solid @color-gray82;
9595
font-size: 1.6rem;
96-
font-weight: 700;
96+
font-weight: @font-weight__bold;
9797
margin: 0;
9898
padding: .8rem 3.5rem .8rem 2rem;
9999

@@ -147,7 +147,7 @@
147147

148148
&.greet.welcome {
149149
border-top: 1px solid @color-gray82;
150-
font-weight: 700;
150+
font-weight: @font-weight__bold;
151151
padding: .8rem @indent__base;
152152
}
153153

@@ -161,7 +161,7 @@
161161
.lib-css(color, @navigation-level0-item__color);
162162
.lib-css(text-decoration, @navigation-level0-item__text-decoration);
163163
display: block;
164-
font-weight: 700;
164+
font-weight: @font-weight__bold;
165165
padding: .8rem @indent__base;
166166
}
167167

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@
109109
.lib-dropdown(
110110
@_toggle-selector: ~'.action.showcart',
111111
@_options-selector: ~'.block-minicart',
112+
@_dropdown-list-width: 320px,
113+
@_dropdown-list-position-right: 0px,
114+
@_dropdown-list-pointer-position: right,
115+
@_dropdown-list-pointer-position-left-right: 26px,
116+
@_dropdown-list-z-index: 101,
112117
@_dropdown-toggle-icon-content: @icon-cart,
113118
@_dropdown-toggle-active-icon-content: @icon-cart,
114119
@_dropdown-list-item-padding: false,
@@ -124,23 +129,10 @@
124129

125130
.block-minicart {
126131
.lib-css(padding, 25px @minicart__padding-horizontal);
127-
right: 0;
128-
width: 320px;
129-
z-index: 101;
130-
132+
131133
.block-title {
132134
display: none;
133135
}
134-
135-
&:after {
136-
left: auto;
137-
right: 25px;
138-
}
139-
140-
&:before {
141-
left: auto;
142-
right: 26px;
143-
}
144136
}
145137

146138
.product {

‎app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@
162162
.lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
163163
}
164164

165+
.step-title {
166+
.lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
167+
.lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
168+
}
169+
165170
.payment-method-title {
166171
.lib-css(padding, @checkout-payment-method-title-mobile__padding)
167172
}

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,40 @@
6060
<attachFile selector="{{AdminProductImagesSection.imageFileUpload}}" userInput="{{image.file}}" stepKey="uploadFile"/>
6161
<waitForAjaxLoad stepKey="waitForAjaxUpload"/>
6262
</actionGroup>
63+
64+
<!--Fill fields for simple product in a category in Admin-->
65+
<actionGroup name="FillAdminSimpleProductForm">
66+
<arguments>
67+
<argument name="category"/>
68+
<argument name="simpleProduct"/>
69+
</arguments>
70+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
71+
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
72+
<click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
73+
<fillField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
74+
<fillField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="fillSKU"/>
75+
<fillField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="fillPrice"/>
76+
<fillField userInput="{{simpleProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
77+
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
78+
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
79+
<fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
80+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
81+
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
82+
<seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
83+
<seeInField userInput="{{simpleProduct.sku}}" selector="{{AdminProductFormSection.productSku}}" stepKey="assertFieldSku"/>
84+
<seeInField userInput="{{simpleProduct.price}}" selector="{{AdminProductFormSection.productPrice}}" stepKey="assertFieldPrice"/>
85+
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
86+
<seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
87+
</actionGroup>
88+
89+
<!--Assert text in Related, Up-Sell or Cross-Sell section in Admin Product page-->
90+
<actionGroup name="AssertTextInAdminProductRelatedUpSellCrossSellSection">
91+
<arguments>
92+
<argument name="element" defaultValue="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
93+
<argument name="expectedText"/>
94+
</arguments>
95+
<conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openTab"/>
96+
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
97+
<see selector="{{element}}" userInput="{{expectedText}}" stepKey="AssertText"/>
98+
</actionGroup>
6399
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontCategoryPageActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AssertProductInStorefrontCategoryPage">
12+
<arguments>
13+
<argument name="category"/>
14+
<argument name="product"/>
15+
</arguments>
16+
<!-- Go to storefront category page, assert product visibility -->
17+
<amOnPage url="{{StorefrontCategoryPage.url(category.name)}}" stepKey="navigateToCategoryPage"/>
18+
<waitForPageLoad stepKey="waitForPageLoad1"/>
19+
<see userInput="{{product.name}}" stepKey="assertProductPresent"/>
20+
<see userInput="{{product.price}}" stepKey="assertProductPricePresent"/>
21+
</actionGroup>
22+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="AssertProductInStorefrontProductPage">
12+
<arguments>
13+
<argument name="product"/>
14+
</arguments>
15+
<!-- Go to storefront product page, assert product visibility -->
16+
<amOnPage url="{{product.urlKey}}.html" stepKey="navigateToProductPage"/>
17+
<waitForPageLoad stepKey="waitForPageLoad2"/>
18+
<seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
19+
<see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
20+
<see userInput="{{product.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
21+
<see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
22+
</actionGroup>
23+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/NewProductActionGroup.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontProductPageActionGroup.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<!--Click Add to Cart button in storefront product page-->
11+
<actionGroup name="addToCartFromStorefrontProductPage">
12+
<arguments>
13+
<argument name="productName"/>
14+
</arguments>
15+
<click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
16+
<waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdding"/>
17+
<waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdding}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdding"/>
18+
<waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAdded"/>
19+
<waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForElementNotVisibleAddToCartButtonTitleIsAdded"/>
20+
<waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAddToCart}}" stepKey="waitForElementVisibleAddToCartButtonTitleIsAddToCart"/>
21+
<waitForPageLoad stepKey="waitForPageLoad"/>
22+
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{productName}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
23+
</actionGroup>
24+
</actionGroups>

0 commit comments

Comments
 (0)