Merge branch '2.4-develop' into #39982

Author: engcom-Dash

app/code/Magento/Authorization/Test/Unit/Helper/RoleTestHelper.php

@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Authorization\Test\Unit\Helper;
+
+use Magento\Authorization\Model\Role;
+
+/**
+ * Test helper for Magento\Authorization\Model\Role
+ *
+ * This helper provides only the custom GWS-related methods that are not available
+ * in the parent Role class. Standard methods like getData(), setData(), and load()
+ * are inherited from Magento\Framework\Model\AbstractModel.
+ */
+class RoleTestHelper extends Role
+{
+    /**
+     * @var array
+     */
+    private $gwsWebsites = [];
+
+    /**
+     * @var array
+     */
+    private $gwsStoreGroups = [];
+
+    /**
+     * @var bool
+     */
+    private $gwsDataIsset = false;
+
+    /**
+     * Skip parent constructor to avoid dependency injection requirements in tests
+     */
+    public function __construct()
+    {
+        // Intentionally empty - avoids parent constructor dependencies
+    }
+
+    /**
+     * Get GWS websites
+     *
+     * @return array
+     */
+    public function getGwsWebsites()
+    {
+        return $this->gwsWebsites;
+    }
+
+    /**
+     * Set GWS websites
+     *
+     * @param array $websites
+     * @return $this
+     */
+    public function setGwsWebsites($websites)
+    {
+        $this->gwsWebsites = $websites;
+        return $this;
+    }
+
+    /**
+     * Get GWS store groups
+     *
+     * @return array
+     */
+    public function getGwsStoreGroups()
+    {
+        return $this->gwsStoreGroups;
+    }
+
+    /**
+     * Set GWS store groups
+     *
+     * @param array $storeGroups
+     * @return $this
+     */
+    public function setGwsStoreGroups($storeGroups)
+    {
+        $this->gwsStoreGroups = $storeGroups;
+        return $this;
+    }
+
+    /**
+     * Set GWS data isset flag
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function setGwsDataIsset($value)
+    {
+        $this->gwsDataIsset = $value;
+        return $this;
+    }
+
+    /**
+     * Load role (overridden to avoid database access in tests)
+     *
+     * @param mixed $modelId
+     * @param string|null $field
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function load($modelId, $field = null)
+    {
+        return $this;
+    }
+}

app/code/Magento/Backend/Test/Mftf/Test/AdminVerifyStateProvinceRequiredOnAddingNewAddressPageTest.xml

@@ -32,6 +32,8 @@
             <actionGroup ref="SetAdminAccountActionGroup" stepKey="setAdminAccountToUnitedStates">
                 <argument name="InterfaceLocaleByValue" value="en_US" />
             </actionGroup>
+            <!--Delete customer created during test execution-->
+            <actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomerFromGrid"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
@@ -40,35 +42,29 @@
                 <argument name="tags" value=""/>
             </actionGroup>
         </after>
-
         <!-- Open Admin Store Configuration Page -->
         <actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfigPage" />
-
         <!--"Choose United Kingdom" as State Option Required and save configuration -->
         <conditionalClick selector="{{StateOptionsSection.stateOptions}}" dependentSelector="{{StateOptionsSection.countriesWithRequiredRegions}}" visible="false" stepKey="expandStateOptionsTab"/>
         <waitForAjaxLoad stepKey="waitForAjax"/>
         <scrollTo selector="{{StateOptionsSection.countriesWithRequiredRegions}}" stepKey="scrollToForm"/>
         <selectOption selector="{{StateOptionsSection.countriesWithRequiredRegions}}" userInput="United Kingdom" stepKey="selectCountriesWithRequiredRegion"/>
         <click selector="#save" stepKey="saveStateOptionsConfig"/>
         <waitForPageLoad stepKey="waitForSavingConfig"/>
-
         <!-- create customer on storefront -->
         <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
         <actionGroup ref="ReloadPageActionGroup" stepKey="refreshPage"/>
         <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
             <argument name="customer" value="Simple_US_Customer"/>
         </actionGroup>
         <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
-
         <!-- Open AddressBook and set Country as "United Kingdom" -->
         <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToAddressBookPage">
             <argument name="menu" value="Address Book"/>
         </actionGroup>
-
         <!-- Choose Country as "United Kingdom" -->
         <selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="United Kingdom" stepKey="selectCountry"/>
         <click selector="{{StorefrontCustomerAddressFormSection.saveAddress}}" stepKey="saveCustomerAddress"/>
-
         <!-- Assert the error message -->
         <seeElement selector="{{StorefrontCustomerMessagesSection.assertErrorMessage}}" stepKey="assetErrorMessage"/>
     </test>

app/code/Magento/Backend/Test/Unit/Helper/ActionStubTestHelper.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Helper;
+
+use Magento\Backend\Test\Unit\App\Action\Stub\ActionStub;
+
+/**
+ * Test helper for ActionStub with additional test-specific methods
+ *
+ * This helper extends ActionStub to provide the setDirtyRulesNoticeMessage()
+ * method which is used in production by CatalogRule controllers but doesn't
+ * exist in the base ActionStub class. Since PHPUnit 12 removed addMethods(),
+ * this helper is necessary to test code that calls this method.
+ *
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
+class ActionStubTestHelper extends ActionStub
+{
+    public function __construct()
+    {
+        // Skip parent constructor for testing
+    }
+    
+    /**
+     * Stub method for testing CatalogRule controllers
+     *
+     * This method is called by AdminGws\Model\Controllers::promoCatalogIndexAction()
+     * but doesn't exist in the base ActionStub class.
+     *
+     * @param string $message
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function setDirtyRulesNoticeMessage($message)
+    {
+        return $this;
+    }
+}

app/code/Magento/Backend/Test/Unit/Helper/ButtonTestHelper.php

@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Helper;
+
+use Magento\Backend\Block\Widget\Button;
+
+/**
+ * Test helper for Button class with custom methods
+ */
+class ButtonTestHelper extends Button
+{
+    /**
+     * @var array
+     */
+    private $data = [];
+
+    /**
+     * Skip parent constructor to avoid dependencies
+     */
+    public function __construct()
+    {
+        // Skip parent constructor - clean initialization
+        $this->data = [];
+    }
+
+    /**
+     * Custom isAllowed method for testing
+     *
+     * @param string|null $resource
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function isAllowed($resource = null): bool
+    {
+        return $this->data['is_allowed'] ?? true;
+    }
+
+    /**
+     * Set is allowed for testing
+     *
+     * @param bool $isAllowed
+     * @return self
+     */
+    public function setIsAllowed(bool $isAllowed): self
+    {
+        $this->data['is_allowed'] = $isAllowed;
+        return $this;
+    }
+
+    /**
+     * Override getAuthorization method
+     *
+     * @return mixed
+     */
+    public function getAuthorization()
+    {
+        return $this->data['authorization'] ?? null;
+    }
+
+    /**
+     * Set authorization for testing
+     *
+     * @param mixed $authorization
+     * @return self
+     */
+    public function setAuthorization($authorization): self
+    {
+        $this->data['authorization'] = $authorization;
+        return $this;
+    }
+
+    /**
+     * Override toHtml method
+     *
+     * @return string
+     */
+    public function toHtml(): string
+    {
+        return $this->data['html'] ?? '';
+    }
+
+    /**
+     * Set HTML output for testing
+     *
+     * @param string $html
+     * @return self
+     */
+    public function setHtml(string $html): self
+    {
+        $this->data['html'] = $html;
+        return $this;
+    }
+}

app/code/Magento/Backend/Test/Unit/Helper/SessionQuoteTestHelper.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Helper;
+
+use Magento\Backend\Model\Session\Quote;
+
+/**
+ * Test helper for Session\Quote
+ *
+ * This helper extends the concrete Session\Quote class to provide
+ * test-specific functionality without dependency injection issues.
+ */
+class SessionQuoteTestHelper extends Quote
+{
+    /**
+     * Constructor that skips parent initialization
+     */
+    public function __construct()
+    {
+        // Skip parent constructor to avoid dependency injection issues
+    }
+
+    /**
+     * Get store ID
+     *
+     * @return int
+     */
+    public function getStoreId()
+    {
+        return 1;
+    }
+}