Skip to content

Commit ef31d20

Browse files
RomaKisRomaKis
committed
MAGETWO-61206: [FT] UpdateSimpleProductEntityTest failed for CURL sending with video
1 parent 6fad45d commit ef31d20

File tree

5 files changed

+38
-29
lines changed

5 files changed

+38
-29
lines changed

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ class View extends AbstractConfigureBlock
168168
*/
169169
protected $ajaxLoading = 'body.ajax-loading';
170170

171+
/**
172+
* Video Container selector
173+
*
174+
* @var string
175+
*/
176+
private $videoContainer = 'div.fotorama-video-container';
177+
171178
/**
172179
* Get block price.
173180
*
@@ -466,4 +473,14 @@ public function isGalleryVisible()
466473
{
467474
return $this->_rootElement->find($this->mediaGallery)->isVisible();
468475
}
476+
477+
/**
478+
* Check is video is visible on product page
479+
*
480+
* @return bool
481+
*/
482+
public function isVideoVisible()
483+
{
484+
return $this->_rootElement->find($this->videoContainer)->isVisible();
485+
}
469486
}

‎dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoProductView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function processAssert(
3232
$browser->open($_ENV['app_frontend_url'] . $initialProduct->getUrlKey() . '.html');
3333
$catalogProductView->getViewBlock()->isGalleryVisible();
3434
\PHPUnit_Framework_Assert::assertFalse(
35-
$catalogProductView->getViewBlock()->isGalleryVisible(),
35+
$catalogProductView->getViewBlock()->isVideoVisible(),
3636
'Product video is displayed on product view when it should not.'
3737
);
3838
}

‎dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertVideoProductView.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function processAssert(
3131
$browser->open($_ENV['app_frontend_url'] . $initialProduct->getUrlKey() . '.html');
3232
$catalogProductView->getViewBlock()->isGalleryVisible();
3333
\PHPUnit_Framework_Assert::assertTrue(
34-
$catalogProductView->getViewBlock()->isGalleryVisible(),
34+
$catalogProductView->getViewBlock()->isVideoVisible(),
3535
'Product video is not displayed on product view when it should.'
3636
);
3737
}

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

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<data name="initialProduct/dataset" xsi:type="string">product_with_video_youtube</data>
1414
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
1515
<data name="product/data/media_gallery/images" xsi:type="string" />
16+
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
1617
<constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
1718
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
1819
<constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
@@ -24,6 +25,7 @@
2425
<data name="initialProduct/dataset" xsi:type="string">product_with_video_vimeo</data>
2526
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
2627
<data name="product/data/media_gallery/images" xsi:type="string" />
28+
<data name="configData" xsi:type="string">play_if_base</data>
2729
<constraint name="Magento\Catalog\Test\Constraint\AssertProductNoImageInGrid" />
2830
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
2931
<constraint name="Magento\ProductVideo\Test\Constraint\AssertNoVideoCategoryView" />
@@ -35,8 +37,7 @@
3537
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
3638
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
3739
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
38-
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
39-
<data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 1"</data>
40+
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Fighters - Congregation</data>
4041
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
4142
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
4243
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
@@ -48,31 +49,7 @@
4849
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
4950
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
5051
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
51-
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
52-
<data name="product/data/media_gallery/images/0/video_description" xsi:type="string">This is a test "Foo Test 2"</data>
53-
<data name="configData" xsi:type="string">play_if_base</data>
54-
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
55-
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
56-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
57-
</variation>
58-
<variation name="AddVideoToPCFTestVariation3">
59-
<data name="tag" xsi:type="string">to_maintain:yes</data>
60-
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
61-
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
62-
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
63-
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://youtu.be/WMp2PvU2qi8</data>
64-
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 1</data>
65-
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
66-
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
67-
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
68-
<constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
69-
</variation>
70-
<variation name="AddVideoToPCFTestVariation4">
71-
<data name="tag" xsi:type="string">to_maintain:yes</data>
72-
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
73-
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
74-
<data name="product/data/media_gallery/images/0/video_url" xsi:type="string">https://vimeo.com/21776334</data>
75-
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Test 2</data>
52+
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Fighters - "Walk" - Official Music Video (HD)</data>
7653
<data name="configData" xsi:type="string">play_if_base</data>
7754
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
7855
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />

‎dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/MAGETWO-61206.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2016 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
10+
<rule scope="testsuite">
11+
<allow>
12+
<class value="Magento\Catalog\Test\TestCase\Product\UpdateSimpleProductEntityTest" />
13+
</allow>
14+
</rule>
15+
</config>

0 commit comments

Comments
 (0)