Merge branch 'AC-2596' into functional-testing-automation-version2

Author: Manjusha.S

app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml

@@ -84,6 +84,7 @@
         <element name="applyDiscountToShipping" type="checkbox" selector="input[name='apply_to_shipping']"/>
         <element name="applyDiscountToShippingLabel" type="checkbox" selector="input[name='apply_to_shipping']+label"/>
         <element name="discountAmount" type="input" selector="input[name='discount_amount']"/>
+        <element name="negativeDiscountAmountError" type="text" selector="//label[@class='admin__field-error' and text()='Please enter a number 0 or greater, without comma in this field.']"/>
         <element name="maximumQtyDiscount" type="input" selector="input[name='discount_qty']"/>
         <element name="discountStep" type="input" selector="input[name='discount_step']"/>
         <element name="applyToShippingAmount" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='apply_to_shipping']/../label"/>

app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml

@@ -9,6 +9,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCartPriceRulesSection">
         <element name="addNewRuleButton" type="button" selector="#add" timeout="30"/>
+        <element name="editRuleButton" type="button" selector="//td[@class=' col-actions col-action  last']/a[text()='Edit']" timeout="30"/>
         <element name="messages" type="text" selector=".messages"/>
         <element name="filterByNameInput" type="input" selector="input[name='name']"/>
         <element name="searchButton" type="button" selector="#promo_quote_grid button[title='Search']" timeout="30"/>