Merge pull request #10445 from magento-gl/spartans_pr_30012026

glo71317 · web-flow · commit aa1fe0db0543 · 2026-01-30T18:12:09.000+05:30
[Spartans] BugFixes Delivery
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/product/set/editor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/product/set/editor.test.js
@@ -181,7 +181,7 @@ define([
         return Promise.all(promises);
     }
 
-    describe('Magento_Catalog/js/category-checkbox-tree', function () {
+    describe('Magento_Catalog/js/product/set/editor', function () {
         let $container, editor;
 
         beforeEach(function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/payment-service.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/payment-service.test.js
@@ -49,7 +49,8 @@ define([
         try {
             injector.remove();
             injector.clean();
-        } catch (e) {}
+        } catch (e) { // eslint-disable-line no-unused-vars
+        }
     });
 
     describe('Magento_Checkout/js/model/payment-service', function () {
@@ -67,7 +68,7 @@ define([
         });
     });
 
-    describe('Magento_Checkout/js/model/payment-service', function () {
+    describe('Magento_Checkout/js/model/payment-service vault methods', function () {
         beforeEach(function (done) {
             injector.mock(mocksPaymentMethodVault);
             // eslint-disable-next-line max-nested-callbacks
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/billing-address-validate.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/billing-address-validate.test.js
@@ -105,7 +105,7 @@ define([
         });
     });
 
-    describe('Magento_Checkout/js/view/billing-address', function () {
+    describe('Magento_Checkout/js/view/billing-address validation', function () {
         describe('"updateAddress" method', function () {
             it('should call updateAddresses when form is invalid with false', function () {
                 billingAddress.source.set.and.callFake(function (key, value) {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/view/authentication-popup.test.js
@@ -49,10 +49,11 @@ define(['squire', 'ko'], function (Squire, ko) {
         try {
             injector.clean();
             injector.remove();
-        } catch (e) {}
+        } catch (e) { // eslint-disable-line no-unused-vars
+        }
     });
 
-    describe('Magento_Customer/js/view/authentication-popup', function () {
+    describe('Magento_Customer/js/view/authentication-popup isActive method', function () {
         describe('"isActive" method', function () {
             it('Check for return value.', function () {
                 mocks['Magento_Customer/js/customer-data'].get.and.returnValue(function () {
@@ -63,7 +64,7 @@ define(['squire', 'ko'], function (Squire, ko) {
         });
     });
 
-    describe('Magento_Customer/js/view/authentication-popup', function () {
+    describe('Magento_Customer/js/view/authentication-popup setModalElement method', function () {
         describe('"setModalElement" method', function () {
             it('skips modal initialization when cart is not initialized', function () {
                 mocks['Magento_Customer/js/customer-data'].get.and.returnValue(
@@ -110,7 +111,7 @@ define(['squire', 'ko'], function (Squire, ko) {
         });
     });
 
-    describe('Magento_Customer/js/view/authentication-popup', function () {
+    describe('Magento_Customer/js/view/authentication-popup login method', function () {
         describe('"login" method', function () {
             it('Check for return value.', function () {
                 var event = {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
@@ -12,7 +12,7 @@ define([
 ], function (Squire, ko, $, Component) {
     'use strict';
 
-    describe('paypal/js/view/payment/method-renderer/paypal-express-abstract', function () {
+    describe('paypal/js/view/payment/method-renderer/paypal-express-in-context', function () {
         var injector = new Squire(),
             mocks = {
                 'Magento_Paypal/js/action/set-payment-method': jasmine.createSpy(),
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.test.js
@@ -39,10 +39,11 @@ define(['squire', 'ko'], function (Squire, ko) {
         try {
             injector.clean();
             injector.remove();
-        } catch (e) {}
+        } catch (e) { // eslint-disable-line no-unused-vars
+        }
     });
 
-    describe('Magento_Tax/js/view/checkout/summary/grand-total', function () {
+    describe('Magento_Tax/js/view/checkout/summary/grand-total getGrandTotalExclTax method', function () {
         describe('"getGrandTotalExclTax" method', function () {
             it('Check if totals object empty.', function () {
                 expect(obj.getGrandTotalExclTax()).toBe(0);
@@ -59,7 +60,7 @@ define(['squire', 'ko'], function (Squire, ko) {
             });
         });
     });
-    describe('Magento_Tax/js/view/checkout/summary/grand-total', function () {
+    describe('Magento_Tax/js/view/checkout/summary/grand-total isBaseGrandTotalDisplayNeeded method', function () {
         describe('"isBaseGrandTotalDisplayNeeded" method', function () {
             it('Check if totals object empty.', function () {
                 expect(obj.isBaseGrandTotalDisplayNeeded()).toBe(false);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js
@@ -14,7 +14,7 @@ define([
             'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['unshift'])
         };
 
-    describe('Magento_Theme/js/view/breadcrumbs', function () {
+    describe('Magento_Theme/js/view/add-home-breadcrumb', function () {
         var breadcrumbs,
             mixin,
             defaultContext = require.s.contexts._;
@@ -41,7 +41,8 @@ define([
             try {
                 injector.clean();
                 injector.remove();
-            } catch (e) {}
+            } catch (e) { // eslint-disable-line no-unused-vars
+            }
         });
 
         it('mixin is applied to Magento_Theme/js/view/breadcrumbs', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
@@ -32,17 +32,15 @@ define([
         });
 
         it('Default state - Select no rows', function () {
-            multiSelect.rows.push({
+            multiSelect.rows([{
                 id: 1
-            });
-            multiSelect.rows.push({
+            }, {
                 id: 2
-            });
-            multiSelect.rows.push({
+            }, {
                 id: 3
-            });
+            }]);
 
-            expect(multiSelect.allSelected()).toBeFalse();
+            expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded().toString()).toEqual('');
             expect(multiSelect.selected().toString()).toEqual('');
         });
@@ -51,7 +49,7 @@ define([
             multiSelect.selected.push(4);
             multiSelect.selected.push(5);
 
-            expect(multiSelect.allSelected()).toBeUndefined();
+            expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded().toString()).toEqual('');
             expect(multiSelect.selected().toString()).toEqual('4,5');
         });
@@ -70,7 +68,7 @@ define([
             }]);
             multiSelect.selectPage();
 
-            expect(multiSelect.allSelected()).toBeUndefined();
+            expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded().toString()).toEqual('');
             expect(multiSelect.selected().toString()).toEqual('1,2,3,4');
         });
@@ -93,7 +91,7 @@ define([
                 id: 6
             }]);
             multiSelect.selected.push(6);
-            expect(multiSelect.allSelected()).toBeUndefined();
+            expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded().toString()).toEqual('5');
             expect(multiSelect.selected().toString()).toEqual('3,4,6');
         });
@@ -112,7 +110,7 @@ define([
             multiSelect.selectPage();
             multiSelect.selected.remove(4); // remove second
 
-            expect(multiSelect.allSelected()).toBeUndefined();
+            expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded().toString()).toEqual('4');
             expect(multiSelect.selected().toString()).toEqual('3');
         });
@@ -130,7 +128,7 @@ define([
                 id: 4
             }]);
 
-            expect(multiSelect.allSelected()).toBeUndefined();
+            expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded().toString()).toEqual('');
             expect(multiSelect.selected().toString()).toEqual('3,4,1,2');
         });
@@ -168,7 +166,7 @@ define([
                     id: 6
                 }]);
 
-                expect(multiSelect.allSelected()).toBeUndefined();
+                expect(multiSelect.allSelected()).toBeFalsy();
                 expect(multiSelect.excluded().toString()).toEqual('3,4');
                 expect(multiSelect.selected().toString()).toEqual('5,6');
             });
diff --git a/dev/tools/grunt/tasks/static.js b/dev/tools/grunt/tasks/static.js
@@ -13,6 +13,20 @@ module.exports = function (grunt) {
             var config = grunt.config.get(task);
 
             config[target].src = data;
+            // Add parser options to support ES6+ features (spread operators, etc.)
+            if (task === 'eslint' && config[target].options) {
+                // Merge overrideConfig if it exists, otherwise create it
+                if (!config[target].options.overrideConfig) {
+                    config[target].options.overrideConfig = [];
+                }
+                // Add language options to support ES2021 features
+                config[target].options.overrideConfig.push({
+                    languageOptions: {
+                        ecmaVersion: 2021,
+                        sourceType: 'script'
+                    }
+                });
+            }
             grunt.config.set(task, config);
         };
 

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ define([`
`181`	`181`	`return Promise.all(promises);`
`182`	`182`	`}`
`183`	`183`
`184`		`- describe('Magento_Catalog/js/category-checkbox-tree', function () {`
	`184`	`+ describe('Magento_Catalog/js/product/set/editor', function () {`
`185`	`185`	`let $container, editor;`
`186`	`186`
`187`	`187`	`beforeEach(function () {`