Fix functional tests

Author: nikshostko

dev/tests/functional/tests/app/Magento/ProductVideo/Test/Repository/ConfigData.xml

@@ -23,5 +23,21 @@
                 <item name="value" xsi:type="string"/>
             </field>
         </dataset>
+        <dataset name="play_if_base">
+            <field name="catalog/product_video/play_if_base" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="string">0</item>
+            </field>
+        </dataset>
+        <dataset name="play_if_base_rollback">
+            <field name="catalog/product_video/play_if_base" xsi:type="array">
+                <item name="scope" xsi:type="string">default</item>
+                <item name="scope_id" xsi:type="number">0</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="string">1</item>
+            </field>
+        </dataset>
     </repository>
 </config>

dev/tests/functional/tests/app/Magento/ProductVideo/Test/TestCase/UpdateSimpleProductEntityTest.xml

@@ -7,34 +7,14 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\UpdateSimpleProductEntityTest" summary="Add Video to PCF" ticketId="PV-1">
-        <variation name="DeleteVideoFromPCFTestVariation1">
-            <data name="description" xsi:type="string">Delete video youtube</data>
-            <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
-            <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
-            <data name="product/data/media_gallery/images" xsi:type="string" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoProductView" />
-        </variation>
-        <variation name="DeleteVideoFromPCFTestVariation2">
-            <data name="description" xsi:type="string">Delete video vimeo</data>
-            <data name="initialProduct/dataset" xsi:type="string">product_with_video_vimeo</data>
-            <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
-            <data name="product/data/media_gallery/images" xsi:type="string" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
-            <constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoProductView" />
-        </variation>
         <variation name="AddVideoToPCFTestVariation1">
             <data name="description" xsi:type="string">Add youtube video with all available fields filled in</data>
             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
             <data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 1"</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">play_if_base,youtube_api_key</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -46,6 +26,7 @@
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
             <data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 2"</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -56,7 +37,7 @@
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -66,6 +47,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -75,14 +57,15 @@
             <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation2">
             <data name="description" xsi:type="string">Edit vimeo URL</data>
             <data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/16342611</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation3">
@@ -91,6 +74,7 @@
             <data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
             <data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
             <data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="UpdateVideoInPCFTestVariation4">
@@ -100,7 +84,7 @@
             <data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
             <data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
             <data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
         </variation>
         <variation name="GetVideoInfoTestVariation1">
@@ -109,7 +93,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
             <data name="video/video_title" xsi:type="string">Foo Fighters - Congregation</data>
-            <data name="configData" xsi:type="string">youtube_api_key</data>
+            <data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
         </variation>
         <variation name="GetVideoInfoTestVariation2">
@@ -118,6 +102,7 @@
             <data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
             <data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
             <data name="video/video_title" xsi:type="string">Foo Fighters - "Walk" - Official Music Video (HD)</data>
+            <data name="configData" xsi:type="string">play_if_base</data>
             <constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
         </variation>
     </testCase>