Merge remote-tracking branch 'origin/MC-39755' into 2.4-develop-pr121

Author: zakdma

app/code/Magento/ProductVideo/etc/csp_whitelist.xml

@@ -10,8 +10,8 @@
     <policies>
         <policy id="script-src">
             <values>
-                <value id="youtube_cdn" type="host">s.ytimg.com</value>
-                <value id="google_video" type="host">www.googleapis.com</value>
+                <value id="youtube_script" type="host">s.ytimg.com</value>
+                <value id="google_apis" type="host">www.googleapis.com</value>
                 <value id="vimeo" type="host">vimeo.com</value>
                 <value id="www_vimeo" type="host">www.vimeo.com</value>
                 <value id="vimeo_cdn" type="host">*.vimeocdn.com</value>
@@ -20,11 +20,13 @@
         <policy id="img-src">
             <values>
                 <value id="vimeo_cdn" type="host">*.vimeocdn.com</value>
+                <value id="youtube_image" type="host">i.ytimg.com</value>
             </values>
         </policy>
         <policy id="frame-src">
             <values>
                 <value id="player_vimeo" type="host">player.vimeo.com</value>
+                <value id="player_youtube" type="host">*.youtube.com</value>
             </values>
         </policy>
     </policies>

app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js

@@ -289,10 +289,10 @@ define([
              * @private
              */
             destroy: function () {
-                this.stop();
-
                 if (this._player) {
+                    this.stop();
                     this._player.destroy();
+                    this._player = undefined;
                 }
             }
         });

dev/tests/js/jasmine/tests/app/code/Magento/ProductVideo/adminhtml/js/get-video-information.test.js

@@ -0,0 +1,44 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_ProductVideo/js/get-video-information'
+], function ($) {
+    'use strict';
+
+    describe('Testing Youtube player Widget', function () {
+        var wdContainer;
+
+        beforeEach(function () {
+            wdContainer = $(
+                '<div>' +
+                '<div class="video-information uploader"><span></span></div>' +
+                '<div class="video-player-container">' +
+                '<div class="product-video"></div>' +
+                '</div>' +
+                '</div>');
+        });
+
+        afterEach(function () {
+            $(wdContainer).remove();
+        });
+
+        it('Widget does not stops player if player is no defined', function () {
+            var video = wdContainer.find('.video-player-container').find('.product-video'),
+                widget;
+
+            video.videoYoutube();
+            widget = video.data('mageVideoYoutube');
+            widget.stop = jasmine.createSpy();
+            widget._player = {
+                destroy: jasmine.createSpy()
+            };
+            widget.destroy();
+            expect(widget._player).toBeUndefined();
+            widget.destroy();
+            expect(widget.stop).toHaveBeenCalledTimes(1);
+        });
+    });
+});