Skip to content

Commit 4ed4a87

Browse files
authored
Merge pull request #138 from magento-pangolin/MC-13210
MC-13210
2 parents 6b93423 + bdf471d commit 4ed4a87

File tree

5 files changed

+21
-0
lines changed

5 files changed

+21
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
3535
</before>
3636
<after>
37+
<!-- Delete product attribute -->
38+
<deleteData createDataKey="attribute" stepKey="deleteProductAttribute"/>
39+
40+
<!-- Delete product attribute set -->
41+
<deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
42+
3743
<actionGroup ref="logout" stepKey="logout"/>
3844
</after>
3945

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<before>
2121
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
22+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2223
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2324
<!--Create simple product-->
2425
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
<before>
2424
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
25+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2526
<!--Create Grouped product with three simple product -->
2627
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2">
2728
<field key="price">100.00</field>

app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,18 @@
4141
<click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
4242
<waitForPageLoad stepKey="waitForCreateAccountButtonToLoad" />
4343
</actionGroup>
44+
45+
<actionGroup name="StorefrontFillRegistrationFormActionGroup" extends="StorefrontCreateCustomerSignedUpNewsletterActionGroup">
46+
<remove keyForRemoval="checkSignUpForNewsletter"/>
47+
<remove keyForRemoval="clickCreateAccountButton"/>
48+
<remove keyForRemoval="waitForCreateAccountButtonToLoad"/>
49+
</actionGroup>
50+
51+
<actionGroup name="SaveRegistrationFormActionGroup">
52+
<click stepKey="clickCreateAccountButton" selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}"/>
53+
<waitForPageLoad stepKey="waitForCreateAccountButtonToLoad" />
54+
</actionGroup>
55+
4456
<actionGroup name="AssertSignedUpNewsletterActionGroup">
4557
<arguments>
4658
<argument name="customer" defaultValue="CustomerEntityOne"/>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@
3333
<element name="emailRequiredMessage" type="text" selector="//input[@name='customer[email]']/../label[contains(.,'This is a required field.')]"/>
3434
<element name="customAttribute" type="select" selector="//select[contains(@name, 'customer[{{attribute_code}}]')]" parameterized="true"/>
3535
<element name="disabledGroup" type="text" selector="//div[@class='admin__action-group-wrap admin__action-multiselect-wrap action-select-wrap _disabled']"/>
36+
<element name="attributeImage" type="block" selector="//div[contains(concat(' ',normalize-space(@class),' '),' file-uploader-preview ')]//img"/>
3637
</section>
3738
</sections>

0 commit comments

Comments
 (0)