Merge branch 'MC-6354' into 'MC-18821'

MC-18821: Increase test coverage for Catalog functional area

See merge request magn-m23/magn-m23!1706

Author: stkorf

dev/tests/js/jasmine/tests/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.test.js

@@ -9,8 +9,10 @@ define([
 ], function ($, SwatchRenderer) {
     'use strict';
 
-    describe('Testing SwatchRenderer Widget', function () {
+    describe('Testing "_RenderSwatchOptions" method of SwatchRenderer Widget', function () {
         var widget,
+            html,
+            optionConfig,
             attribute,
             optionId = 2,
             swathImageHeight = '60',
@@ -22,11 +24,21 @@ define([
             widget = new SwatchRenderer();
             attribute = {
                 id: 1,
-                options: [{id: optionId}]
+                options: [{
+                    id: optionId
+                }]
             };
             widget.options = {
-                classes: {optionClass: "swatch-option"},
-                jsonSwatchConfig: {1: {2: {type: 2}}},
+                classes: {
+                    optionClass: 'swatch-option'
+                },
+                jsonSwatchConfig: {
+                    1: {
+                        2: {
+                            type: 2
+                        }
+                    }
+                },
                 jsonSwatchImageSizeConfig: {
                     swatchImage: {
                         width: swathImageWidth,
@@ -38,39 +50,31 @@ define([
                     }
                 }
             };
+            optionConfig = widget.options.jsonSwatchConfig[attribute.id];
+            html = $(widget._RenderSwatchOptions(attribute, 'option-label-control-id-1'))[0];
         });
 
-        describe('"_RenderSwatchOptions" method', function () {
-            var html,
-                optionConfig;
-
-            beforeEach(function () {
-                optionConfig = widget.options.jsonSwatchConfig[attribute.id];
-                html = $(widget._RenderSwatchOptions(attribute, 'option-label-control-id-1'))[0];
-            });
-
-            it('check if swatch config has attribute id', function () {
-                expect(widget.options.jsonSwatchConfig.hasOwnProperty(attribute.id)).toEqual(true);
-            });
+        it('check if swatch config has attribute id', function () {
+            expect(widget.options.jsonSwatchConfig.hasOwnProperty(attribute.id)).toEqual(true);
+        });
 
-            it('check if option config has option id', function () {
-                expect(optionConfig.hasOwnProperty(optionId)).toEqual(true);
-            });
+        it('check if option config has option id', function () {
+            expect(optionConfig.hasOwnProperty(optionId)).toEqual(true);
+        });
 
-            it('check swatch thumbnail image height attribute', function () {
-                expect(html.hasAttribute('thumb-height')).toBe(true);
-                expect(html.getAttribute('thumb-height')).toEqual(swathThumbImageHeight);
-            });
+        it('check swatch thumbnail image height attribute', function () {
+            expect(html.hasAttribute('thumb-height')).toBe(true);
+            expect(html.getAttribute('thumb-height')).toEqual(swathThumbImageHeight);
+        });
 
-            it('check swatch thumbnail image width attribute', function () {
-                expect(html.hasAttribute('thumb-width')).toBe(true);
-                expect(html.getAttribute('thumb-width')).toEqual(swathThumbImageWidth);
-            });
+        it('check swatch thumbnail image width attribute', function () {
+            expect(html.hasAttribute('thumb-width')).toBe(true);
+            expect(html.getAttribute('thumb-width')).toEqual(swathThumbImageWidth);
+        });
 
-            it('check swatch image styles', function () {
-                expect(html.style.height).toEqual(swathImageHeight + 'px');
-                expect(html.style.width).toEqual(swathImageWidth + 'px');
-            });
+        it('check swatch image styles', function () {
+            expect(html.style.height).toEqual(swathImageHeight + 'px');
+            expect(html.style.width).toEqual(swathImageWidth + 'px');
         });
     });
 });