MAGETWO-96706: Cart Price Rule with related Banner for specific Customer Segment is persisted under long-term cookie

Author: bshevchenko

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

@@ -10,7 +10,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
         <element name="save" type="button" selector="#save" timeout="30"/>
-        <element name="saveAndContinue" type="button" selector="#save_and_continue_edit" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="button[id*=save_and_continue]" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml

@@ -28,6 +28,6 @@
     <!--Check Subscribed Newsletter via StoreFront-->
     <actionGroup name="CheckSubscribedNewsletterActionGroup">
         <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
-        <seeElement selector="{{StorefrontNewsletterManageSection.subscriptionChecked}}" stepKey="checkSubscribedNewsletter"/>
+        <seeCheckboxIsChecked selector="{{StorefrontNewsletterManageSection.subscriptionCheckbox}}" stepKey="checkSubscribedNewsletter"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml

@@ -10,6 +10,5 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontNewsletterManageSection">
         <element name="subscriptionCheckbox" type="checkbox" selector="#subscription" />
-        <element name="subscriptionChecked" type="checkbox" selector="#subscription[checked='checked']" />
     </section>
 </sections>

app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml

@@ -16,6 +16,6 @@
         <data key="shippingPostCode">Magento\SalesRule\Model\Rule\Condition\Address|postcode</data>
         <data key="shippingRegion">Magento\SalesRule\Model\Rule\Condition\Address|region</data>
         <data key="shippingState">Magento\SalesRule\Model\Rule\Condition\Address|region_id</data>
-        <data key="ShippingCountry">Magento\SalesRule\Model\Rule\Condition\Address|country_id</data>
+        <data key="shippingCountry">Magento\SalesRule\Model\Rule\Condition\Address|country_id</data>
     </entity>
 </entities>