Merge remote-tracking branch 'origin/MC-40657' into 2.4-develop-pr51

Author: Serhii Balko

app/code/Magento/CheckoutAgreements/Model/Checkout/Plugin/Validation.php

@@ -86,30 +86,6 @@ public function beforeSavePaymentInformationAndPlaceOrder(
         }
     }
 
-    /**
-     * Check validation before saving the payment information
-     *
-     * @param \Magento\Checkout\Api\PaymentInformationManagementInterface $subject
-     * @param int $cartId
-     * @param \Magento\Quote\Api\Data\PaymentInterface $paymentMethod
-     * @param \Magento\Quote\Api\Data\AddressInterface|null $billingAddress
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
-     */
-    public function beforeSavePaymentInformation(
-        \Magento\Checkout\Api\PaymentInformationManagementInterface $subject,
-        $cartId,
-        \Magento\Quote\Api\Data\PaymentInterface $paymentMethod,
-        \Magento\Quote\Api\Data\AddressInterface $billingAddress = null
-    ) {
-        $quote = $this->quoteRepository->getActive($cartId);
-        if ($this->isAgreementEnabled() && !$quote->getIsMultiShipping()) {
-            $this->validateAgreements($paymentMethod);
-        }
-    }
-
     /**
      * Validate agreements base on the payment method
      *

app/code/Magento/CheckoutAgreements/Test/Unit/Model/Checkout/Plugin/ValidationTest.php

@@ -126,11 +126,9 @@ public function testBeforeSavePaymentInformationAndPlaceOrder()
             ->willReturn(true);
         $searchCriteriaMock = $this->createMock(SearchCriteria::class);
         $this->quoteMock
-            ->expects($this->once())
             ->method('getIsMultiShipping')
             ->willReturn(false);
         $this->quoteRepositoryMock
-            ->expects($this->once())
             ->method('getActive')
             ->with($cartId)
             ->willReturn($this->quoteMock);
@@ -146,7 +144,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrder()
         $this->paymentMock->expects(static::atLeastOnce())
             ->method('getExtensionAttributes')
             ->willReturn($this->extensionAttributesMock);
-        $this->model->beforeSavePaymentInformation(
+        $this->model->beforeSavePaymentInformationAndPlaceOrder(
             $this->subjectMock,
             $cartId,
             $this->paymentMock,
@@ -166,11 +164,9 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
             ->willReturn(true);
         $searchCriteriaMock = $this->createMock(SearchCriteria::class);
         $this->quoteMock
-            ->expects($this->once())
             ->method('getIsMultiShipping')
             ->willReturn(false);
         $this->quoteRepositoryMock
-            ->expects($this->once())
             ->method('getActive')
             ->with($cartId)
             ->willReturn($this->quoteMock);
@@ -186,7 +182,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
         $this->paymentMock->expects(static::atLeastOnce())
             ->method('getExtensionAttributes')
             ->willReturn($this->extensionAttributesMock);
-        $this->model->beforeSavePaymentInformation(
+        $this->model->beforeSavePaymentInformationAndPlaceOrder(
             $this->subjectMock,
             $cartId,
             $this->paymentMock,
@@ -198,40 +194,6 @@ public function testBeforeSavePaymentInformationAndPlaceOrderIfAgreementsNotVali
         );
     }
 
-    public function testBeforeSavePaymentInformation()
-    {
-        $cartId = 100;
-        $agreements = [1, 2, 3];
-        $this->scopeConfigMock
-            ->expects($this->once())
-            ->method('isSetFlag')
-            ->with(AgreementsProvider::PATH_ENABLED, ScopeInterface::SCOPE_STORE)
-            ->willReturn(true);
-        $this->quoteMock
-            ->expects($this->once())
-            ->method('getIsMultiShipping')
-            ->willReturn(false);
-        $this->quoteRepositoryMock
-            ->expects($this->once())
-            ->method('getActive')
-            ->with($cartId)
-            ->willReturn($this->quoteMock);
-        $searchCriteriaMock = $this->createMock(SearchCriteria::class);
-        $this->agreementsFilterMock->expects($this->once())
-            ->method('buildSearchCriteria')
-            ->willReturn($searchCriteriaMock);
-        $this->checkoutAgreementsListMock->expects($this->once())
-            ->method('getList')
-            ->with($searchCriteriaMock)
-            ->willReturn([1]);
-        $this->extensionAttributesMock->expects($this->once())->method('getAgreementIds')->willReturn($agreements);
-        $this->agreementsValidatorMock->expects($this->once())->method('isValid')->with($agreements)->willReturn(true);
-        $this->paymentMock->expects(static::atLeastOnce())
-            ->method('getExtensionAttributes')
-            ->willReturn($this->extensionAttributesMock);
-        $this->model->beforeSavePaymentInformation($this->subjectMock, $cartId, $this->paymentMock, $this->addressMock);
-    }
-
     /**
      * Build payment extension mock.
      *