Merge pull request magento#95 from magento-pangolin/MC-4580

okorshenko · Apr 16, 2019 · db3901e · db3901e
2 parents 443f4c3 + a3fa76d
commit db3901e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 3 deletions.
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerDashboardPage.xml
@@ -12,5 +12,6 @@
         <section name="StorefrontCustomerDashboardAccountInformationSection" />
         <section name="StorefrontCustomerSidebarSection"/>
         <section name="StorefrontMinicartSection"/>
+        <section name="StorefrontCustomerFooterSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -31,6 +31,7 @@
         <element name="firstNameRequiredMessage" type="text" selector="//input[@name='customer[firstname]']/../label[contains(.,'This is a required field.')]"/>
         <element name="lastNameRequiredMessage" type="text" selector="//input[@name='customer[lastname]']/../label[contains(.,'This is a required field.')]"/>
         <element name="emailRequiredMessage" type="text" selector="//input[@name='customer[email]']/../label[contains(.,'This is a required field.')]"/>
+        <element name="customAttribute" type="select" selector="//select[contains(@name, 'customer[{{attribute_code}}]')]" parameterized="true"/>
         <element name="disabledGroup" type="text" selector="//div[@class='admin__action-group-wrap admin__action-multiselect-wrap action-select-wrap _disabled']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerFooterSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerFooterSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerFooterSection">
+        <element name="footerBlock" type="block" selector="//footer"/>
+        <element name="formSubscribe" type="input" selector="input#newsletter"/>
+        <element name="buttonSubscribe" type="button" selector="//form[@id='newsletter-validate-detail']//button[contains(@class, 'subscribe')]" timeout="15"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -25,7 +25,6 @@
     </actionGroup>
 
     <actionGroup name="AdminCreateCartPriceRuleAndStayOnEditActionGroup" extends="AdminCreateCartPriceRuleActionGroup" >
-        <click selector="{{AdminCartPriceRulesFormSection.discardSubsequentRules}}" stepKey="setYesDiscardSubsequentRule" after="clickToExpandActions"/>
         <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveButton"/>
     </actionGroup>
 

diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminDeleteCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminDeleteCartPriceRuleActionGroup.xml
@@ -19,4 +19,4 @@
         <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
         <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>
diff --git a/...Test/Mftf/ActionGroup/SetCartAttributeConditionWithSegmentForCartPriceRuleActionGroup.xml b/...Test/Mftf/ActionGroup/SetCartAttributeConditionWithSegmentForCartPriceRuleActionGroup.xml
@@ -43,4 +43,4 @@
         <click selector="{{AdminCartPriceRulesFormSection.condition('matches')}}" stepKey="clickToChooseOption" after="waitForOperator"/>
         <selectOption userInput="{{operatorType}}" selector="{{AdminCartPriceRulesFormSection.conditionsOperator}}" stepKey="setOperatorType" after="clickToChooseOption"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -339,3 +339,4 @@
         <data key="discountAmount">50</data>
     </entity>
 </entities>
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -339,3 +339,4 @@
		<data key="discountAmount">50</data>
		</entity>
		</entities>