Merge remote-tracking branch 'origin/MC-36777' into 2.4-develop-pr83

viktorpetryk · viktorpetryk · commit e64708ddb350 · 2020-09-02T15:16:32.000+03:00
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
@@ -34,6 +34,9 @@
             <deleteData createDataKey="category3" stepKey="deleteCategory3"/>
             <deleteData createDataKey="category2" stepKey="deleteCategory2"/>
             <deleteData createDataKey="category1" stepKey="deleteCategory1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </after>
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="amOnStorefrontPage"/>
         <moveMouseOver
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -135,7 +135,7 @@ require([
                 content: "{$block->escapeJs(__('Are you sure you want to strip tags?'))}",
                 actions: {
                     confirm: function () {
-                        this.unconvertedText = $('template_text').value;
+                        self.unconvertedText = $('template_text').value;
                         $('convert_button').hide();
                         $('template_text').value =  $('template_text').value.stripScripts().replace(
                             new RegExp('<style[^>]*>[\\S\\s]*?</style>', 'img'), ''
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -16,6 +16,9 @@
             <description value="Users are able to place order using Paypal Smart Button on Checkout Page, payment action is Sale"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
+            <skip>
+                <issueId value="MC-37236"/>
+            </skip>
             <group value="paypalExpress"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -16,6 +16,9 @@
             <description value="Users are able to place order using Paypal Smart Button using Euro currency and merchant country is France"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
+            <skip>
+                <issueId value="MC-37236"/>
+            </skip>
             <group value="paypalExpress"/>
         </annotations>
         <before>
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -184,61 +184,4 @@ protected function assertResponseFields($actualResponse, $assertionMap)
             );
         }
     }
-
-    /**
-     * Compare arrays recursively regardless of nesting.
-     *
-     * Can compare arrays that have both one level and n-level nesting.
-     * ```
-     *  [
-     * 'products' => [
-     *      'items' => [
-     *      [
-     *          'sku'       => 'bundle-product',
-     *          'type_id'   => 'bundle',
-     *          'items'     => [
-     *          [
-     *              'title'     => 'Bundle Product Items',
-     *              'sku'       => 'bundle-product',
-     *              'options'   => [
-     *              [
-     *                  'price' => 2.75,
-     *                  'label' => 'Simple Product',
-     *                  'product' => [
-     *                      'name'    => 'Simple Product',
-     *                      'sku'     => 'simple',
-     *                  ]
-     *              ]
-     *          ]
-     *      ]
-     *  ];
-     * ```
-     *
-     * @param array $expected
-     * @param array $actual
-     * @return array
-     */
-    public function compareArraysRecursively(array $expected, array $actual): array
-    {
-        $diffResult = [];
-
-        foreach ($expected as $key => $value) {
-            if (array_key_exists($key, $actual)) {
-                if (is_array($value)) {
-                    $recursiveDiff = $this->compareArraysRecursively($value, $actual[$key]);
-                    if (!empty($recursiveDiff)) {
-                        $diffResult[$key] = $recursiveDiff;
-                    }
-                } else {
-                    if (!in_array($value, $actual, true)) {
-                        $diffResult[$key] = $value;
-                    }
-                }
-            } else {
-                $diffResult[$key] = $value;
-            }
-        }
-
-        return $diffResult;
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php
@@ -7,13 +7,29 @@
 
 namespace Magento\GraphQl\Bundle;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\CompareArraysRecursively;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
  * Bundle product with multiple options test.
  */
 class BundleProductMultipleOptionsTest extends GraphQlAbstract
 {
+    /**
+     * @var CompareArraysRecursively
+     */
+    private $compareArraysRecursively;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->compareArraysRecursively = $objectManager->create(CompareArraysRecursively::class);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options.php
      * @param array $bundleProductDataProvider
@@ -85,7 +101,7 @@ private function assertBundleProduct(array $response, array $bundleProductDataPr
         $productItems = $response['products']['items'];
 
         foreach ($bundleProductDataProvider as $key => $data) {
-            $diff = $this->compareArraysRecursively($data, $productItems[$key]);
+            $diff = $this->compareArraysRecursively->execute($data, $productItems[$key]);
             self::assertEquals([], $diff, "Actual response doesn't equal to expected data");
         }
     }
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
@@ -6,79 +6,78 @@
 /*eslint max-nested-callbacks: 0*/
 define([
     'jquery',
-    'ko',
     'Magento_Ui/js/grid/masonry'
-], function ($, ko, Masonry) {
+], function ($, Masonry) {
     'use strict';
 
-    var Component,
-        rows,
-        container = '<div data-id="masonry_grid" id="masonry_grid"><div class="masonry-image-column"></div></div>';
+    describe('Magento_Ui/js/grid/masonry', function () {
+        var Component,
+            rows,
+            container = '<div data-id="masonry_grid" id="masonry_grid"><div class="masonry-image-column"></div></div>';
 
-    beforeEach(function () {
-        rows = [
-            {
-                _rowIndex: 0,
-                category: {},
-                'category_id': 695,
-                'category_name': 'People',
-                'comp_url': 'https://stock.adobe.com/Rest/Libraries/Watermarked/Download/327515738/2',
-                'content_type': 'image/jpeg',
-                'country_name': 'Malaysia',
-                'creation_date': '2020-03-02 10:41:51',
-                'creator_id': 208217780,
-                'creator_name': 'NajmiArif',
-                height: 3264,
-                id: 327515738,
-                'id_field_name': 'id',
-                'is_downloaded': 0,
-                'is_licensed_locally': 0,
-                keywords: [],
-                'media_type_id': 1,
-                overlay: '',
-                path: '',
-                'premium_level_id': 0,
-                'thumbnail_240_url': 'https://t4.ftcdn.net/jpg/03/27/51/57/240_F_327515738_n.jpg',
-                'thumbnail_500_ur': 'https://as2.ftcdn.net/jpg/03/27/51/57/500_F_327515738_n.jpg',
-                title: 'Neon effect picture of man wearing medical mask for viral or pandemic disease',
-                width: 4896
-            }
+        beforeEach(function () {
+            rows = [
+                {
+                    _rowIndex: 0,
+                    category: {},
+                    'category_id': 695,
+                    'category_name': 'People',
+                    'comp_url': 'url',
+                    'content_type': 'image/jpeg',
+                    'country_name': 'Malaysia',
+                    'creation_date': '2020-03-02 10:41:51',
+                    'creator_id': 208217780,
+                    'creator_name': 'NajmiArif',
+                    height: 3264,
+                    id: 327515738,
+                    'id_field_name': 'id',
+                    'is_downloaded': 0,
+                    'is_licensed_locally': 0,
+                    keywords: [],
+                    'media_type_id': 1,
+                    overlay: '',
+                    path: '',
+                    'premium_level_id': 0,
+                    'thumbnail_240_url': 'url',
+                    'thumbnail_500_ur': 'url',
+                    title: 'Neon effect picture of man wearing medical mask for viral or pandemic disease',
+                    width: 4896
+                }
+            ];
 
-        ];
-
-        $(container).appendTo('body');
-
-        Component = new Masonry({
-            defaults: {
-                rows: ko.observable()
-            }
+            $(document.body).append(container);
+            Component = new Masonry({
+                defaults: {
+                    containerId: '#masonry_grid'
+                }
+            });
         });
 
-    });
-
-    afterEach(function () {
-        $('#masonry_grid').remove();
-    });
+        afterEach(function () {
+            Component.clear();
+            $('#masonry_grid').remove();
+        });
 
-    describe('check initComponent', function () {
-        it('verify setLayoutstyles called and grid iniztilized', function () {
-            var setlayoutStyles = spyOn(Component, 'setLayoutStyles');
+        describe('check initComponent', function () {
+            it('verify setLayoutstyles called and grid iniztilized', function () {
+                var setlayoutStyles = spyOn(Component, 'setLayoutStyles');
 
-            expect(Component).toBeDefined();
-            Component.containerId = 'masonry_grid';
-            Component.initComponent(rows);
-            Component.rows().forEach(function (image) {
-                expect(image.styles).toBeDefined();
-                expect(image.css).toBeDefined();
+                expect(Component).toBeDefined();
+                Component.containerId = 'masonry_grid';
+                Component.initComponent(rows);
+                Component.rows().forEach(function (image) {
+                    expect(image.styles).toBeDefined();
+                    expect(image.css).toBeDefined();
+                });
+                expect(setlayoutStyles).toHaveBeenCalled();
             });
-            expect(setlayoutStyles).toHaveBeenCalled();
-        });
-        it('verify events triggered', function () {
-            var setLayoutStyles = spyOn(Component, 'setLayoutStyles');
+            it('verify events triggered', function () {
+                var setLayoutStyles = spyOn(Component, 'setLayoutStyles');
 
-            Component.initComponent(rows);
-            window.dispatchEvent(new Event('resize'));
-            expect(setLayoutStyles).toHaveBeenCalled();
+                Component.initComponent(rows);
+                window.dispatchEvent(new Event('resize'));
+                expect(setLayoutStyles).toHaveBeenCalled();
+            });
         });
     });
 });
diff --git a/package.json.sample b/package.json.sample
@@ -18,7 +18,7 @@
         "grunt-contrib-connect": "~1.0.2",
         "grunt-contrib-cssmin": "~2.2.1",
         "grunt-contrib-imagemin": "~2.0.1",
-        "grunt-contrib-jasmine": "~1.1.0",
+        "grunt-contrib-jasmine": "~1.2.0",
         "grunt-contrib-less": "~1.4.1",
         "grunt-contrib-watch": "~1.0.0",
         "grunt-eslint": "~20.1.0",
@@ -39,4 +39,4 @@
         "time-grunt": "~1.4.0",
         "underscore": "~1.8.0"
     }
-}
+}
