Skip to content

Commit 3f1b17f

Browse files
authored
Merge branch '2.4-develop' into LYNX-199
2 parents 70eece9 + e820604 commit 3f1b17f

File tree

5 files changed

+604
-8
lines changed

5 files changed

+604
-8
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
<argument name="keyword" value="api-simple-product"/>
4646
</actionGroup>
4747

48-
<actionGroup ref="AdminCheckProductByIdOnProductGridActionGroup" stepKey="clickCheckbox1">
49-
<argument name="productId" value="$$createProductOne.id$$"/>
48+
<actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="clickCheckbox1">
49+
<argument name="product" value="$createProductOne$"/>
5050
</actionGroup>
5151

52-
<actionGroup ref="AdminCheckProductByIdOnProductGridActionGroup" stepKey="clickCheckbox2">
53-
<argument name="productId" value="$$createProductTwo.id$$"/>
52+
<actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="clickCheckbox2">
53+
<argument name="product" value="$createProductTwo$"/>
5454
</actionGroup>
5555

5656
<actionGroup ref="AdminClickMassUpdateProductAttributesActionGroup" stepKey="clickDropdown"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontNotApplicableShippingMethodInReviewAndPaymentStepTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<!-- Assert Shipping total is not yet calculated -->
126126
<actionGroup ref="AssertStorefrontNotCalculatedValueInShippingTotalInOrderSummaryActionGroup" stepKey="assertNotYetCalculated"/>
127127

128-
<!-- Assert order cannot be placed and error message will shown. -->
128+
<!-- Assert order cannot be placed and error message will be shown. -->
129129
<actionGroup ref="AssertStorefrontOrderIsNotPlacedActionGroup" stepKey="assertOrderCannotBePlaced">
130130
<argument name="error" value="The shipping method is missing. Select the shipping method and try again."/>
131131
</actionGroup>
@@ -144,7 +144,7 @@
144144
<!-- Place order assert succeed -->
145145
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="checkoutPlaceOrder"/>
146146

147-
<!-- Loged in Customer Test Scenario -->
147+
<!-- Logged in Customer Test Scenario -->
148148
<!-- Login with created Customer -->
149149
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
150150
<argument name="Customer" value="$$createCustomer$$"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/GenerateConfigurationsByAttributeCodeActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<arguments>
1616
<argument name="attributeCode" type="string" defaultValue="SomeString"/>
1717
</arguments>
18-
18+
<waitForElementClickable selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="waitForCreateConfigurationsButtonToBeClickable"/>
1919
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
2020
<click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
2121
<fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="{{attributeCode}}" stepKey="fillFilterAttributeCodeField"/>

0 commit comments

Comments
 (0)