Merge remote-tracking branch 'arcticfoxes/MC-17649' into 2.2.10-develop-pr

Author: Joan He

app/code/Magento/Customer/Model/AccountManagement.php

@@ -970,6 +970,7 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
                 null,
                 $extensions
             );
+            $customer->setConfirmation(null);
         } catch (MailException $e) {
             // If we are not able to send a new account email, this should be ignored
             $this->logger->critical($e);

dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php

@@ -228,14 +228,21 @@ public function testGetCustomerActivateCustomer()
                 'token' => $this->token
             ]
         ];
-        $requestData = ['confirmationKey' => $this->customerData[CustomerInterface::CONFIRMATION]];
+
+        $requestData = ['confirmationKey' => CustomerHelper::CONFIRMATION];
         if (TESTS_WEB_API_ADAPTER === 'soap') {
             $requestData['customerId'] = 0;
         }
-        $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
-        $this->assertEquals($this->customerData[CustomerInterface::ID], $customerResponseData[CustomerInterface::ID]);
-        // Confirmation key is removed after confirmation
-        $this->assertFalse(isset($customerResponseData[CustomerInterface::CONFIRMATION]));
+
+        try {
+            $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
+            $this->assertEquals(
+                $this->customerData[CustomerInterface::ID],
+                $customerResponseData[CustomerInterface::ID]
+            );
+        } catch (\Exception $e) {
+            $this->fail('Customer is not activated.');
+        }
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php

@@ -220,7 +220,15 @@ public function testCreateCustomerWithErrors()
     public function testActivateCustomer()
     {
         $customerData = $this->_createCustomer();
-        $this->assertNotNull($customerData[Customer::CONFIRMATION], 'Customer activation is not required');
+
+        // Update the customer's confirmation key to a known value
+        $customerData = $this->customerHelper->updateSampleCustomer(
+            $customerData[Customer::ID],
+            [
+                'id' => $customerData[Customer::ID],
+                'confirmation' => CustomerHelper::CONFIRMATION
+            ]
+        );
 
         $serviceInfo = [
             'rest' => [
@@ -236,16 +244,15 @@ public function testActivateCustomer()
 
         $requestData = [
             'email' => $customerData[Customer::EMAIL],
-            'confirmationKey' => $customerData[Customer::CONFIRMATION],
+            'confirmationKey' => CustomerHelper::CONFIRMATION
         ];
 
-        $result = $this->_webApiCall($serviceInfo, $requestData);
-
-        $this->assertEquals($customerData[Customer::ID], $result[Customer::ID], 'Wrong customer!');
-        $this->assertTrue(
-            !isset($result[Customer::CONFIRMATION]) || $result[Customer::CONFIRMATION] === null,
-            'Customer is not activated!'
-        );
+        try {
+            $result = $this->_webApiCall($serviceInfo, $requestData);
+            $this->assertEquals($customerData[Customer::ID], $result[Customer::ID], 'Wrong customer!');
+        } catch (\Exception $e) {
+            $this->fail('Customer is not activated.');
+        }
     }
 
     public function testGetCustomerActivateCustomer()
@@ -265,14 +272,15 @@ public function testGetCustomerActivateCustomer()
         ];
         $requestData = [
             'email' => $customerData[Customer::EMAIL],
-            'confirmationKey' => $customerData[Customer::CONFIRMATION],
+            'confirmationKey' => CustomerHelper::CONFIRMATION
         ];
 
-        $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
-
-        $this->assertEquals($customerData[Customer::ID], $customerResponseData[Customer::ID]);
-        // Confirmation key is removed after confirmation
-        $this->assertFalse(isset($customerResponseData[Customer::CONFIRMATION]));
+        try {
+            $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
+            $this->assertEquals($customerData[Customer::ID], $customerResponseData[Customer::ID]);
+        } catch (\Exception $e) {
+            $this->fail('Customer is not activated.');
+        }
     }
 
     public function testValidateResetPasswordLinkToken()