Merge remote-tracking branch 'origin/AC1536' into gl_pr_jan13_2022

Author: rimple-saini

app/code/Magento/Customer/Observer/UpgradeOrderCustomerEmailObserver.php

@@ -66,6 +66,7 @@ public function execute(Observer $observer): void
         }
         $searchCriteria = $this->searchCriteriaBuilder
             ->addFilter(OrderInterface::CUSTOMER_ID, $customer->getId())
+            ->addFilter(OrderInterface::CUSTOMER_EMAIL, $originalCustomer->getEmail())
             ->create();
 
         /**

app/code/Magento/Customer/Test/Unit/Observer/UpgradeOrderCustomerEmailObserverTest.php

@@ -171,7 +171,7 @@ private function setOriginalCustomerToEventMock(MockObject $originalCustomer): v
 
     private function setCustomerEmail(MockObject $originalCustomer, string $email): void
     {
-        $originalCustomer->expects($this->once())
+        $originalCustomer->expects($this->any())
             ->method('getEmail')
             ->willReturn($email);
     }
@@ -186,7 +186,7 @@ private function whenOrderRepositoryGetListIsCalled(MockObject $orderCollectionM
             ->method('create')
             ->willReturn($searchCriteriaMock);
 
-        $this->searchCriteriaBuilderMock->expects($this->once())
+        $this->searchCriteriaBuilderMock->expects($this->any())
             ->method('addFilter')
             ->willReturn($this->searchCriteriaBuilderMock);
 

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php

@@ -16,13 +16,13 @@
 
 class OrderGetTest extends WebapiAbstract
 {
-    const RESOURCE_PATH = '/V1/orders';
+    private const RESOURCE_PATH = '/V1/orders';
 
-    const SERVICE_READ_NAME = 'salesOrderRepositoryV1';
+    private const SERVICE_READ_NAME = 'salesOrderRepositoryV1';
 
-    const SERVICE_VERSION = 'V1';
+    private const SERVICE_VERSION = 'V1';
 
-    const ORDER_INCREMENT_ID = '100000001';
+    private const ORDER_INCREMENT_ID = '100000001';
 
     /**
      * @var ObjectManagerInterface
@@ -74,7 +74,7 @@ public function testOrderGet(): void
         $expectedShippingAddress = [
             'address_type' => 'shipping',
             'city' => 'Los Angeles',
-            'email' => 'customer@null.com',
+            'email' => 'customer@example.com',
             'postcode' => '11111',
             'region' => 'CA'
         ];

dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php

@@ -39,8 +39,8 @@
  */
 class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const CUSTOMER_ID = 1;
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const CUSTOMER_ID = 1;
 
     /** @var AccountManagementInterface */
     private $accountManagement;
@@ -685,7 +685,7 @@ public function testUpgradeOrderCustomerEmailObserverWhenEmailIsNotModified(): v
         $customerOrders = $this->orderRepository->getList($searchCriteria);
 
         foreach ($customerOrders as $customerOrder) {
-            $this->assertEquals('customer@null.com', $customerOrder->getCustomerEmail());
+            $this->assertEquals('customer@example.com', $customerOrder->getCustomerEmail());
         }
     }
 }

dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/FormTest.php

@@ -91,7 +91,7 @@ protected function login($customerId)
     private function prepareRequestData($invalidData = false)
     {
         $orderId = 100000001;
-        $email = $invalidData ? 'wrong@example.com' : 'customer@null.com';
+        $email = $invalidData ? 'wrong@example.com' : 'customer@example.com';
 
         /** @var FormKey $formKey */
         $formKey = $this->_objectManager->get(FormKey::class);

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/CreditmemoSenderTest.php

@@ -18,9 +18,9 @@
 
 class CreditmemoSenderTest extends TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const OLD_CUSTOMER_EMAIL = 'customer@null.com';
-    const ORDER_EMAIL = 'customer@null.com';
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const OLD_CUSTOMER_EMAIL = 'customer@example.com';
+    private const ORDER_EMAIL = 'customer@example.com';
 
     /**
      * @var CustomerRepository

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php

@@ -28,9 +28,9 @@
  */
 class InvoiceSenderTest extends TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const OLD_CUSTOMER_EMAIL = 'customer@null.com';
-    const ORDER_EMAIL = 'customer@null.com';
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const OLD_CUSTOMER_EMAIL = 'customer@example.com';
+    private const ORDER_EMAIL = 'customer@example.com';
 
     /** @var ObjectManagerInterface */
     private $objectManager;

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/ShipmentSenderTest.php

@@ -21,9 +21,9 @@
  */
 class ShipmentSenderTest extends \PHPUnit\Framework\TestCase
 {
-    const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
-    const OLD_CUSTOMER_EMAIL = 'customer@null.com';
-    const ORDER_EMAIL = 'customer@null.com';
+    private const NEW_CUSTOMER_EMAIL = 'new.customer@example.com';
+    private const OLD_CUSTOMER_EMAIL = 'customer@example.com';
+    private const ORDER_EMAIL = 'customer@example.com';
 
     /**
      * @var CustomerRepository

dev/tests/integration/testsuite/Magento/Sales/_files/order.php

@@ -64,7 +64,7 @@
     ->setOrderCurrencyCode('USD')
     ->setBaseCurrencyCode('USD')
     ->setCustomerIsGuest(true)
-    ->setCustomerEmail('customer@null.com')
+    ->setCustomerEmail('customer@example.com')
     ->setBillingAddress($billingAddress)
     ->setShippingAddress($shippingAddress)
     ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())