Skip to content

Commit 90051bd

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MAGETWO-61206' into 2.0-develop-pr6
2 parents 808f0f8 + 9cfde20 commit 90051bd

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public function processAssert(
3030
InjectableFixture $initialProduct
3131
) {
3232
$browser->open($_ENV['app_frontend_url'] . $initialProduct->getUrlKey() . '.html');
33-
$catalogProductView->getViewBlock()->isGalleryVisible();
33+
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ public function processAssert(
2929
InjectableFixture $initialProduct
3030
) {
3131
$browser->open($_ENV['app_frontend_url'] . $initialProduct->getUrlKey() . '.html');
32-
$catalogProductView->getViewBlock()->isGalleryVisible();
32+
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: 6 additions & 6 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,8 +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>
52+
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Fighters - "Walk" - Official Music Video (HD)</data>
5353
<data name="configData" xsi:type="string">play_if_base</data>
5454
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
5555
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
@@ -61,7 +61,7 @@
6161
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
6262
<data name="product/data/sku" xsi:type="string">sku_simple_product_with_video_%isolation%</data>
6363
<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>
64+
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Fighters - Congregation</data>
6565
<data name="configData" xsi:type="string">youtube_api_key,play_if_base</data>
6666
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
6767
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />
@@ -72,7 +72,7 @@
7272
<data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
7373
<data name="product/data/sku" xsi:type="string">simple_product_with_category_%isolation%</data>
7474
<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>
75+
<data name="product/data/media_gallery/images/0/video_title" xsi:type="string">Foo Fighters - "Walk" - Official Music Video (HD)</data>
7676
<data name="configData" xsi:type="string">play_if_base</data>
7777
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoCategoryView" />
7878
<constraint name="Magento\ProductVideo\Test\Constraint\AssertVideoProductView" />

0 commit comments

Comments
 (0)