Skip to content

Commit 9944fd7

Browse files
nikshostkonikshostko
committed
Merge branch 'MAGETWO_fix-functional-tests' into 'master4'
Magetwo fix functional tests See merge request !171
2 parents 679ef90 + 3235ede commit 9944fd7

File tree

3 files changed

+28
-10
lines changed

3 files changed

+28
-10
lines changed

‎dev/tests/functional/tests/app/Magento/ProductVideo/Test/Fixture/Product/MediaGallery.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public function __construct(array $params, $data = [])
4747
*
4848
* @param string $filename
4949
* @return void
50-
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
5150
*/
5251
protected function createTestImage($filename)
5352
{
@@ -58,8 +57,6 @@ protected function createTestImage($filename)
5857

5958
// Create a color (this first call to imageColorAllocate
6059
// also automatically sets the image background color)
61-
$colorRed = imageColorAllocate($image, 255, 0, 0);
62-
// Create another color
6360
$colorYellow = imageColorAllocate($image, 255, 255, 0);
6461

6562
// Draw a rectangle

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,33 @@
1111
<field name="catalog/product_video/youtube_api_key" xsi:type="array">
1212
<item name="scope" xsi:type="string">default</item>
1313
<item name="scope_id" xsi:type="number">0</item>
14-
<item name="label" xsi:type="string"/>
14+
<item name="label" xsi:type="string">Yes</item>
1515
<item name="value" xsi:type="string">AIzaSyDwqDWuw1lra-LnpJL2Mr02DYuFmkuRSns</item>
1616
</field>
1717
</dataset>
1818
<dataset name="youtube_api_key_rollback">
1919
<field name="catalog/product_video/youtube_api_key" xsi:type="array">
2020
<item name="scope" xsi:type="string">default</item>
2121
<item name="scope_id" xsi:type="number">0</item>
22-
<item name="label" xsi:type="string"/>
22+
<item name="label" xsi:type="string">Yes</item>
2323
<item name="value" xsi:type="string"/>
2424
</field>
2525
</dataset>
26+
<dataset name="play_if_base">
27+
<field name="catalog/product_video/play_if_base" xsi:type="array">
28+
<item name="scope" xsi:type="string">default</item>
29+
<item name="scope_id" xsi:type="number">0</item>
30+
<item name="label" xsi:type="string">Yes</item>
31+
<item name="value" xsi:type="string">0</item>
32+
</field>
33+
</dataset>
34+
<dataset name="play_if_base_rollback">
35+
<field name="catalog/product_video/play_if_base" xsi:type="array">
36+
<item name="scope" xsi:type="string">default</item>
37+
<item name="scope_id" xsi:type="number">0</item>
38+
<item name="label" xsi:type="string">Yes</item>
39+
<item name="value" xsi:type="string">1</item>
40+
</field>
41+
</dataset>
2642
</repository>
2743
</config>

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
3535
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
3636
<data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 1"</data>
37-
<data name="configData" xsi:type="string">youtube_api_key</data>
37+
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
3838
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
3939
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
4040
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -46,6 +46,7 @@
4646
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
4747
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
4848
<data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 2"</data>
49+
<data name="configData" xsi:type="string">play_if_base</data>
4950
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
5051
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
5152
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -56,7 +57,7 @@
5657
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
5758
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
5859
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
59-
<data name="configData" xsi:type="string">youtube_api_key</data>
60+
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
6061
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
6162
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
6263
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -66,6 +67,7 @@
6667
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
6768
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
6869
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
70+
<data name="configData" xsi:type="string">play_if_base</data>
6971
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
7072
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
7173
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
@@ -75,14 +77,15 @@
7577
<data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
7678
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
7779
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
78-
<data name="configData" xsi:type="string">youtube_api_key</data>
80+
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
7981
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
8082
</variation>
8183
<variation name="UpdateVideoInPCFTestVariation2">
8284
<data name="description" xsi:type="string">Edit vimeo URL</data>
8385
<data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
8486
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
8587
<data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/16342611</data>
88+
<data name="configData" xsi:type="string">play_if_base</data>
8689
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
8790
</variation>
8891
<variation name="UpdateVideoInPCFTestVariation3">
@@ -91,6 +94,7 @@
9194
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
9295
<data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
9396
<data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
97+
<data name="configData" xsi:type="string">play_if_base</data>
9498
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
9599
</variation>
96100
<variation name="UpdateVideoInPCFTestVariation4">
@@ -100,7 +104,7 @@
100104
<data name="productVideo/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/bpOSxM0rNPM</data>
101105
<data name="productVideo/data/media_gallery/images/0/video_title" xsi:type="string">Edit Test</data>
102106
<data name="productVideo/data/media_gallery/images/0/video_description" xsi:type="string">This is an edit test</data>
103-
<data name="configData" xsi:type="string">youtube_api_key</data>
107+
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
104108
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
105109
</variation>
106110
<variation name="GetVideoInfoTestVariation1">
@@ -109,7 +113,7 @@
109113
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
110114
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
111115
<data name="video/video_title" xsi:type="string">Foo Fighters - Congregation</data>
112-
<data name="configData" xsi:type="string">youtube_api_key</data>
116+
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
113117
<constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
114118
</variation>
115119
<variation name="GetVideoInfoTestVariation2">
@@ -118,6 +122,7 @@
118122
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
119123
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
120124
<data name="video/video_title" xsi:type="string">Foo Fighters - "Walk" - Official Music Video (HD)</data>
125+
<data name="configData" xsi:type="string">play_if_base</data>
121126
<constraint name="Magento\ProductVideo\Test\Constraint\AssertGetVideoInfoDataIsCorrect" />
122127
</variation>
123128
</testCase>

0 commit comments

Comments
 (0)