MAGETWO-67496: Apply minimum advertised price to product on a product level when Display Actual Price On Gesture

Author: pdohogne-magento

dev/tests/functional/tests/app/Magento/Msrp/Test/Repository/CatalogProductSimple.xml

@@ -103,7 +103,7 @@
             <field name="msrp_display_actual_price_type" xsi:type="string">In Cart</field>
         </dataset>
 
-        <dataset name="msrp_on_gesture_for_product_with_quotes_in_product_name">
+        <dataset name="msrp_on_gesture_for_product_with_single_quotes_in_product_name">
             <field name="name" xsi:type="string">\'Simple Product with\' msrp on gesture %isolation%</field>
             <field name="url_key" xsi:type="string">simple-product-with-msrp on gesture-%isolation%</field>
             <field name="sku" xsi:type="string">sku_simple_product_with_msrp_on_gesture_%isolation%</field>
@@ -134,5 +134,37 @@
             <field name="msrp" xsi:type="string">35</field>
             <field name="msrp_display_actual_price_type" xsi:type="string">On Gesture</field>
         </dataset>
+
+        <dataset name="msrp_on_gesture_for_product_with_one_single_quote_in_product_name">
+            <field name="name" xsi:type="string">\'Simple Product with msrp on gesture %isolation%</field>
+            <field name="url_key" xsi:type="string">simple-product-with-msrp on gesture-%isolation%</field>
+            <field name="sku" xsi:type="string">sku_simple_product_with_msrp_on_gesture_%isolation%</field>
+            <field name="weight" xsi:type="string">1</field>
+            <field name="product_has_weight" xsi:type="string">This item has weight</field>
+            <field name="quantity_and_stock_status" xsi:type="array">
+                <item name="qty" xsi:type="string">1000</item>
+                <item name="is_in_stock" xsi:type="string">In Stock</item>
+            </field>
+            <field name="price" xsi:type="array">
+                <item name="value" xsi:type="string">20</item>
+                <item name="dataset" xsi:type="string">-</item>
+            </field>
+            <field name="category_ids" xsi:type="array">
+                <item name="dataset" xsi:type="string">default_subcategory</item>
+            </field>
+            <field name="tax_class_id" xsi:type="array">
+                <item name="dataset" xsi:type="string">taxable_goods</item>
+            </field>
+            <field name="website_ids" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="dataset" xsi:type="string">default</item>
+                </item>
+            </field>
+            <field name="stock_data" xsi:type="array">
+                <item name="manage_stock" xsi:type="string">No</item>
+            </field>
+            <field name="msrp" xsi:type="string">35</field>
+            <field name="msrp_display_actual_price_type" xsi:type="string">On Gesture</field>
+        </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/Msrp/Test/TestCase/ApplyMapTest.xml

@@ -31,7 +31,15 @@
             <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpInShoppingCart" />
         </variation>
         <variation name="ApplyMapTestVariation4" summary="Apply MAP Setting on Gesture to Simple Product with Quotes in product name" ticketId="MAGETWO-69318">
-            <data name="product" xsi:type="string">catalogProductSimple::msrp_on_gesture_for_product_with_quotes_in_product_name</data>
+            <data name="product" xsi:type="string">catalogProductSimple::msrp_on_gesture_for_product_with_single_quotes_in_product_name</data>
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnCategoryPage" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMapOnCategoryPage" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnProductView" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMapOnProductView" />
+            <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpInShoppingCart" />
+        </variation>
+        <variation name="ApplyMapTestVariation5" summary="Apply MAP Setting on Gesture to Simple Product with Quotes in product name" ticketId="MAGETWO-69318">
+            <data name="product" xsi:type="string">catalogProductSimple::msrp_on_gesture_for_product_with_one_single_quote_in_product_name</data>
             <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnCategoryPage" />
             <constraint name="Magento\Msrp\Test\Constraint\AssertMapOnCategoryPage" />
             <constraint name="Magento\Msrp\Test\Constraint\AssertMsrpOnProductView" />