Merge remote-tracking branch 'adobe-commerce-tier-4/ACP2E-3364' into Tier4-Kings-PR-11-22-2024

Author: devarul

app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    /**
-    * Copyright © Magento, Inc. All rights reserved.
-    * See COPYING.txt for license details.
-    */
+/************************************************************************
+ *
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ *
+ * ************************************************************************
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -39,7 +42,7 @@
         </actionGroup>
 
         <click selector="{{AdminSearchSynonymsNewSection.resetButton}}" stepKey="clickResetButton"/>
-
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
         <grabValueFrom selector="{{AdminSearchSynonymsNewSection.scope}}" stepKey="grabScopeValue"/>
         <assertEquals stepKey="assertScopeDefaultValue">
             <expectedResult type="string">0:0</expectedResult>
@@ -53,7 +56,7 @@
 
         <grabValueFrom selector="{{AdminSearchSynonymsNewSection.merge}}" stepKey="grabMergeValue"/>
         <assertEquals stepKey="assertMergeDefaultValue">
-            <expectedResult type="string">false</expectedResult>
+            <expectedResult type="string">0</expectedResult>
             <actualResult type="string">$grabMergeValue</actualResult>
         </assertEquals>
     </test>

app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js

@@ -10,7 +10,7 @@ define(function () {
     'use strict';
 
     return {
-        'reset': '#reset',
+        'reset': '#reset_ui_form',
         'save': '#save',
         'saveAndContinue': '#save_and_continue'
     };

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter/buttons.test.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+define(['Magento_Ui/js/form/adapter/buttons'], function (uiFormSelectors) {
+    'use strict';
+    describe('UI Form Selectors Module', function () {
+
+        it('should define reset, save, and saveAndContinue selectors', function () {
+            // Check that the properties are defined
+            expect(uiFormSelectors).toBeDefined();
+            expect(uiFormSelectors.reset).toBeDefined();
+            expect(uiFormSelectors.save).toBeDefined();
+            expect(uiFormSelectors.saveAndContinue).toBeDefined();
+
+            // Verify that each selector matches the expected value
+            expect(uiFormSelectors.reset).toBe('#reset_ui_form');
+            expect(uiFormSelectors.save).toBe('#save');
+            expect(uiFormSelectors.saveAndContinue).toBe('#save_and_continue');
+        });
+
+    });
+});