Skip to content

Commit 76ea0c3

Browse files
author
bshevchenko
committed
MAGETWO-96705: Cart Price Rule with related Banner for specific Customer Segment is persisted under long-term cookie
1 parent a08360a commit 76ea0c3

26 files changed

+294
-65
lines changed

app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminMainActionsSection">
1212
<element name="save" type="button" selector="#save" timeout="30"/>
13+
<element name="saveAndContinue" type="button" selector="button[id*=save_and_]" timeout="30"/>
1314
<element name="delete" type="button" selector="#delete"/>
1415
<element name="add" type="button" selector="#add" timeout="30"/>
1516
<element name="back" type="button" selector="#back" timeout="30"/>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<!-- Logged in user checkout filling shipping section -->
4747
<actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">
4848
<arguments>
49-
<argument name="customerVar"/>
50-
<argument name="customerAddressVar"/>
49+
<argument name="customerVar" defaultValue="CustomerEntityOne"/>
50+
<argument name="customerAddressVar" defaultValue="CustomerAddressSimple"/>
5151
</arguments>
5252
<waitForElementVisible selector="{{CheckoutShippingSection.firstName}}" stepKey="waitForFirstNameFieldAppears" time="30"/>
5353
<fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
<element name="itemQuantity" type="input" selector="//a[text()='{{productName}}']/../..//input[contains(@class,'cart-item-qty')]" parameterized="true"/>
2626
<element name="itemQuantityUpdate" type="button" selector="//a[text()='{{productName}}']/../..//span[text()='Update']" parameterized="true"/>
2727
<element name="emptyCart" type="text" selector=".counter.qty.empty"/>
28+
<element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
2829
</section>
2930
</sections>

app/code/Magento/Cms/Test/Mftf/Page/AdminCmsBlockEditPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminCmsBlockEditPage" url="/cms/block/edit/id/{{var1}}" area="admin" module="Magento_Cms" parameterized="true">
1212
<section name="AdminCmsBlockContentSection" />
13+
<section name="AdminMediaGallerySection" />
1314
</page>
1415
</pages>

app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
-->
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="StorefrontHomePage" url="/" module="Magento_Cms" area="storefront">
1212
<section name="StorefrontHeaderSection"/>
1313
<section name="StorefrontQuickSearchSection"/>
1414
<section name="StorefrontHeaderCurrencySwitcherSection"/>
15+
<section name="StorefrontCmsPageSection"/>
1516
</page>
1617
</pages>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminMediaGallerySection">
12+
<element name="imageSelected" type="text" selector="//small[text()='{{imageName}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
13+
<element name="uploadImage" type="file" selector="input.fileupload" />
14+
<element name="insertFile" type="text" selector="#insert_files"/>
15+
<element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
16+
</section>
17+
</sections>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="StorefrontCmsPageSection">
12+
<element name="imageSource" type="text" selector="img[src*='{{imageName}}']" parameterized="true"/>
13+
</section>
14+
</sections>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="OpenEditCustomerFromAdminActionGroup" extends="clearFiltersAdminDataGrid">
1111
<arguments>
12-
<argument name="customer"/>
12+
<argument name="customer" defaultValue="CustomerEntityOne"/>
1313
</arguments>
1414
<amOnPage url="{{AdminCustomerPage.url}}" before="waitForPageLoad" stepKey="navigateToCustomers"/>
1515
<click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
1616
<fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
1717
<click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="applyFilter"/>
1818
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
1919
<click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEdit"/>
20-
<waitForPageLoad stepKey="waitForPageLoad2" />
20+
<waitForPageLoad stepKey="waitForPageLoad" />
2121
</actionGroup>
2222
</actionGroups>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
<!--Delete a customer by Email by filtering grid and using delete action-->
1111
<actionGroup name="RemoveCustomerFromAdminActionGroup">
1212
<arguments>
13-
<argument name="customer"/>
13+
<argument name="customer" defaultValue="CustomerEntityOne"/>
1414
</arguments>
1515
<amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
16-
<waitForPageLoad stepKey="waitForPageLoad1" />
1716
<conditionalClick selector="{{AdminCustomerFiltersSection.clearFilters}}" dependentSelector="{{AdminCustomerFiltersSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
1817
<click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
1918
<fillField userInput="{{customer.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
@@ -28,6 +27,6 @@
2827
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
2928
<see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="A total of 1 record(s) were deleted." stepKey="seeSuccessMessage"/>
3029
<conditionalClick selector="{{AdminCustomerFiltersSection.clearFilters}}" dependentSelector="{{AdminCustomerFiltersSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
31-
<waitForPageLoad stepKey="waitForPageLoad2"/>
30+
<waitForPageLoad stepKey="waitForPageLoad"/>
3231
</actionGroup>
3332
</actionGroups>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="SignUpNewUserFromStorefrontActionGroup">
1111
<arguments>
12-
<argument name="Customer"/>
12+
<argument name="Customer" defaultValue="CustomerEntityOne"/>
1313
</arguments>
1414
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
15-
<waitForPageLoad stepKey="waitForStorefrontPage"/>
1615
<click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickOnCreateAccountLink"/>
1716
<fillField userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}" stepKey="fillFirstName"/>
1817
<fillField userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}" stepKey="fillLastName"/>

0 commit comments

Comments
 (0)