Skip to content

Commit 1b7bade

Browse files
eduard13eduard13
authored
Merge branch '2.4-develop' into feature/review-graphql-261
2 parents dd796f3 + 8b38e63 commit 1b7bade

File tree

12 files changed

+71
-45
lines changed

12 files changed

+71
-45
lines changed

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurationsByAttributeCodeAndNavigateToOptionsQuantityActionGroup.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateConfigurationsByAttributeCodeAndNavigateToOptionsQuantityActionGroup" extends="GenerateConfigurationsByAttributeCodeActionGroup">
12+
<annotations>
13+
<description>Selects all Attribute options for the provided Attribute Code and navigates to Options quantity on the Configurable Product creation/edit page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="price" type="string" defaultValue="100"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="clickOnNextButton2" stepKey="waitForNextPageOpened"/>
20+
<click selector="{{AdminCreateProductConfigurationsPanel.applySinglePriceToAllSkus}}" after="waitForNextPageOpened" stepKey="clickOnApplySinglePriceToAllSkus"/>
21+
<fillField selector="{{AdminCreateProductConfigurationsPanel.singlePrice}}" userInput="{{price}}" after="clickOnApplySinglePriceToAllSkus" stepKey="enterAttributePrice"/>
22+
23+
<remove keyForRemoval="clickOnApplySingleQuantityToEachSku"/>
24+
<remove keyForRemoval="enterAttributeQuantity"/>
25+
<remove keyForRemoval="clickOnNextButton3"/>
26+
<remove keyForRemoval="clickOnNextButton4"/>
27+
</actionGroup>
28+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveConfigurationTest.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@
2525

2626
<after>
2727
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
28+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteConfigurableProductFilteredBySkuAndName">
29+
<argument name="sku" value="{{_defaultProduct.sku}}"/>
30+
</actionGroup>
31+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnProductIndexPage"/>
2832
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
33+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
34+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
2935
</after>
3036

3137
<!-- Create a configurable product via the UI -->

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
*/
66
-->
77

8-
<div class="admin__collapsible-block-wrapper opened">
9-
<div class="fieldset-wrapper-title">
8+
<div class="fieldset-wrapper admin__collapsible-block-wrapper opened" data-bind="mageInit: {'collapsible':{'active':true,'openedState':'opened'}}">
9+
<div class="fieldset-wrapper-title toggle" data-role="title">
1010
<strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
1111
<span data-bind="text: title"></span>
1212
</strong>
1313
</div>
1414

15-
<div class="fieldset-wrapper-content in collapse" data-collapsed="true" data-bind="attr: {id: id}">
15+
<div class="fieldset-wrapper-content in collapse" data-role="content" data-collapsed="true" data-bind="attr: {id: id}">
1616
<!-- ko template: {
1717
name: "ui/grid/paging/paging", data: paging
1818
} -->

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@
2626
<deleteData stepKey="deleteCustomer" createDataKey="customer" />
2727
</after>
2828

29-
<amOnPage stepKey="amOnSignInPage" url="{{StorefrontCustomerSignInPage.url}}"/>
30-
<fillField stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
31-
<fillField stepKey="fillPassword" userInput="$$customer.password$$INVALID" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
32-
<click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
33-
<see stepKey="seeErrorMessage" selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."/>
29+
<actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
30+
<actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormWithCustomerData">
31+
<argument name="customer" value="$$customer$$"/>
32+
</actionGroup>
33+
<actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt"/>
34+
<actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFirstAttempt">
35+
<argument name="messageType" value="error"/>
36+
<argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
37+
</actionGroup>
3438
</test>
3539
</tests>

‎app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml‎

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

‎app/code/Magento/Swatches/Test/Mftf/Data/SwatchAttributeData.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,9 @@
4949
<data key="used_in_product_listing">1</data>
5050
<data key="used_for_sort_by">0</data>
5151
</entity>
52+
<entity name="TextSwatchProductAttributeForm" extends="VisualSwatchProductAttributeForm">
53+
<data key="frontend_label[0]" unique="suffix">TextSwatchAttribute-</data>
54+
<data key="frontend_input">swatch_text</data>
55+
<data key="attribute_code" unique="suffix">text_swatch_attribute_</data>
56+
</entity>
5257
</entities>

‎app/code/Magento/Swatches/Test/Mftf/Metadata/SwatchProductAttributeMeta.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<operation name="CreateSwatchProductAttributeForm" dataType="SwatchProductAttributeForm" type="create"
1212
auth="adminFormKey" url="catalog/product_attribute/save" method="POST" successRegex="/messages-message-success/" returnRegex="">
1313
<contentType>application/x-www-form-urlencoded</contentType>
14+
<field key="attribute_id">string</field>
1415
<field key="frontend_label[0]">string</field>
1516
<field key="frontend_label[1]">string</field>
1617
<field key="frontend_input">string</field>
@@ -43,4 +44,7 @@
4344
<field key="used_in_product_listing">string</field>
4445
<field key="used_for_sort_by">string</field>
4546
</operation>
47+
<operation name="DeleteSwatchProductAttributeForm" dataType="SwatchProductAttributeForm" type="delete" auth="adminOauth" url="/V1/products/attributes/{attribute_code}" method="DELETE">
48+
<contentType>application/json</contentType>
49+
</operation>
4650
</operations>

‎app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,17 @@ define([
292292
return _.isArray(products) ? products[0] : null;
293293
},
294294

295+
/**
296+
* Get chosen product id
297+
*
298+
* @returns int|null
299+
*/
300+
getProductId: function () {
301+
var products = this._CalcProducts();
302+
303+
return _.isArray(products) && products.length === 1 ? products[0] : null;
304+
},
305+
295306
/**
296307
* @private
297308
*/

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,6 @@
122122
&:before {
123123
content: @icon-expand-close__content;
124124
}
125-
&.active {
126-
&:before {
127-
content: @icon-expand-open__content;
128-
}
129-
}
130125
}
131126
}
132127

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,6 @@
414414
&:extend(.abs-blocks-2columns all);
415415
.login {
416416
.actions-toolbar {
417-
margin-left: 0;
418-
419417
> .primary {
420418
margin-bottom: 0;
421419
margin-right: @indent__l;
@@ -430,19 +428,8 @@
430428

431429
.fieldset {
432430
&:after {
433-
margin-left: 0;
434431
&:extend(.abs-margin-for-forms-desktop all);
435432
}
436-
437-
> .field {
438-
> .control {
439-
width: 80%;
440-
}
441-
442-
.label {
443-
text-align: left;
444-
}
445-
}
446433
}
447434
}
448435

0 commit comments

Comments
 (0)