Merge branch 'ACP2E-1311' of https://github.com/magento-l3/magento2ce into PR-2023-02-07

Author: ArtemVasyliev

dev/tests/integration/testsuite/Magento/Customer/Block/Form/LoginTest.php

@@ -47,9 +47,23 @@ protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->layout = $this->objectManager->get(LayoutInterface::class);
+
+        $code = 'customer_login_form_submit';
+        $buttonLock = $this->getMockBuilder(\Magento\ReCaptchaUi\Model\ButtonLock::class)
+            ->disableOriginalConstructor()
+            ->disableAutoload()
+            ->setMethods(['isDisabled', 'getCode'])
+            ->getMock();
+        $buttonLock->expects($this->any())->method('getCode')->willReturn($code);
+        $buttonLock->expects($this->any())->method('isDisabled')->willReturn(false);
+        $buttonLockManager = $this->objectManager->create(
+            ButtonLockManager::class,
+            ['buttonLockPool' => [$code => $buttonLock]]
+        );
+
         $this->block = $this->layout->createBlock(Login::class);
         $this->block->setTemplate('Magento_Customer::form/login.phtml');
-        $this->block->setButtonLockManager($this->objectManager->get(ButtonLockManager::class));
+        $this->block->setButtonLockManager($buttonLockManager);
 
         parent::setUp();
     }

dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php

@@ -28,10 +28,10 @@ public function testCompanyDefault(): void
         /** @var \Magento\Customer\Block\Widget\Company $block */
         $block = Bootstrap::getObjectManager()->create(Register::class)
             ->setTemplate('Magento_Customer::form/register.phtml')
-            ->setShowAddressFields(true)
-            ->setButtonLockManager(Bootstrap::getObjectManager()->create(ButtonLockManager::class));
+            ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
         $this->setRegionProvider($block);
+        $this->setButtonLockManager($block);
 
         $this->assertStringContainsString('title="Company"', $block->toHtml());
     }
@@ -46,10 +46,10 @@ public function testTelephoneDefault(): void
         /** @var \Magento\Customer\Block\Widget\Company $block */
         $block = Bootstrap::getObjectManager()->create(Register::class)
             ->setTemplate('Magento_Customer::form/register.phtml')
-            ->setShowAddressFields(true)
-            ->setButtonLockManager(Bootstrap::getObjectManager()->create(ButtonLockManager::class));
+            ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
         $this->setRegionProvider($block);
+        $this->setButtonLockManager($block);
 
         $this->assertStringContainsString('title="Phone Number"', $block->toHtml());
     }
@@ -64,10 +64,10 @@ public function testFaxDefault(): void
         /** @var \Magento\Customer\Block\Widget\Company $block */
         $block = Bootstrap::getObjectManager()->create(Register::class)
             ->setTemplate('Magento_Customer::form/register.phtml')
-            ->setShowAddressFields(true)
-            ->setButtonLockManager(Bootstrap::getObjectManager()->create(ButtonLockManager::class));
+            ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
         $this->setRegionProvider($block);
+        $this->setButtonLockManager($block);
 
         $this->assertStringNotContainsString('title="Fax"', $block->toHtml());
     }
@@ -89,10 +89,10 @@ public function testCompanyDisabled(): void
         /** @var \Magento\Customer\Block\Widget\Company $block */
         $block = Bootstrap::getObjectManager()->create(Register::class)
             ->setTemplate('Magento_Customer::form/register.phtml')
-            ->setShowAddressFields(true)
-            ->setButtonLockManager(Bootstrap::getObjectManager()->create(ButtonLockManager::class));
+            ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
         $this->setRegionProvider($block);
+        $this->setButtonLockManager($block);
 
         $this->assertStringNotContainsString('title="Company"', $block->toHtml());
     }
@@ -114,10 +114,10 @@ public function testTelephoneDisabled(): void
         /** @var \Magento\Customer\Block\Widget\Company $block */
         $block = Bootstrap::getObjectManager()->create(Register::class)
             ->setTemplate('Magento_Customer::form/register.phtml')
-            ->setShowAddressFields(true)
-            ->setButtonLockManager(Bootstrap::getObjectManager()->create(ButtonLockManager::class));
+            ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
         $this->setRegionProvider($block);
+        $this->setButtonLockManager($block);
 
         $this->assertStringNotContainsString('title="Phone Number"', $block->toHtml());
     }
@@ -139,10 +139,10 @@ public function testFaxEnabled(): void
         /** @var \Magento\Customer\Block\Widget\Company $block */
         $block = Bootstrap::getObjectManager()->create(Register::class)
             ->setTemplate('Magento_Customer::form/register.phtml')
-            ->setShowAddressFields(true)
-            ->setButtonLockManager(Bootstrap::getObjectManager()->create(ButtonLockManager::class));
+            ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
         $this->setRegionProvider($block);
+        $this->setButtonLockManager($block);
 
         $this->assertStringContainsString('title="Fax"', $block->toHtml());
     }
@@ -155,10 +155,10 @@ public function testCityWithStoreLabel(): void
         /** @var \Magento\Customer\Block\Form\Register $block */
         $block = Bootstrap::getObjectManager()->create(Register::class)
             ->setTemplate('Magento_Customer::form/register.phtml')
-            ->setShowAddressFields(true)
-            ->setButtonLockManager(Bootstrap::getObjectManager()->create(ButtonLockManager::class));
+            ->setShowAddressFields(true);
         $this->setAttributeDataProvider($block);
         $this->setRegionProvider($block);
+        $this->setButtonLockManager($block);
 
         $this->assertStringNotContainsString('title="City"', $block->toHtml());
         $this->assertStringContainsString('title="Suburb"', $block->toHtml());
@@ -197,4 +197,27 @@ private function setRegionProvider(Template $block): void
         $regionProvider = Bootstrap::getObjectManager()->create(RegionProvider::class);
         $block->setRegionProvider($regionProvider);
     }
+
+    /**
+     * Set Button Lock Manager View Model
+     *
+     * @param Template $block
+     * @return void
+     */
+    private function setButtonLockManager(Template $block): void
+    {
+        $code = 'customer_create_form_submit';
+        $buttonLock = $this->getMockBuilder(\Magento\ReCaptchaUi\Model\ButtonLock::class)
+            ->disableOriginalConstructor()
+            ->disableAutoload()
+            ->setMethods(['isDisabled', 'getCode'])
+            ->getMock();
+        $buttonLock->expects($this->any())->method('getCode')->willReturn($code);
+        $buttonLock->expects($this->any())->method('isDisabled')->willReturn(false);
+        $buttonLockManager = Bootstrap::getObjectManager()->create(
+            ButtonLockManager::class,
+            ['buttonLockPool' => [$code => $buttonLock]]
+        );
+        $block->setButtonLockManager($buttonLockManager);
+    }
 }