Merge remote-tracking branch 'XxXgeoXxX/2.3-develop#469' into 2.3-develop#469

Author: naydav

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php

@@ -24,11 +24,6 @@ class CreateCustomerTest extends GraphQlAbstract
      */
     private $customerRepository;
 
-    /**
-     * @var null|string
-     */
-    private $customerRandomEmail = null;
-
     protected function setUp()
     {
         parent::setUp();
@@ -45,15 +40,15 @@ public function testCreateCustomerAccountWithPassword()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $this->customerRandomEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $newEmail = 'customer_created_random123@example.com';
 
         $query = <<<QUERY
 mutation {
     createCustomer(
         input: {
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
-            email: "{$this->customerRandomEmail}"
+            email: "{$newEmail}"
             password: "{$currentPassword}"
           	is_subscribed: true
         }
@@ -72,7 +67,7 @@ public function testCreateCustomerAccountWithPassword()
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-        $this->assertEquals($this->customerRandomEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
         $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
     }
 
@@ -83,15 +78,15 @@ public function testCreateCustomerAccountWithoutPassword()
     {
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
-        $this->customerRandomEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $newEmail = 'customer_created_random123@example.com';
 
         $query = <<<QUERY
 mutation {
     createCustomer(
         input: {
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
-            email: "{$this->customerRandomEmail}"
+            email: "{$newEmail}"
           	is_subscribed: true
         }
     ) {
@@ -109,7 +104,7 @@ public function testCreateCustomerAccountWithoutPassword()
 
         $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
         $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
-        $this->assertEquals($this->customerRandomEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
         $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
     }
 
@@ -216,7 +211,7 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $newEmail = 'customer_created_random123@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -245,17 +240,21 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
 
     public function tearDown()
     {
-        if ($this->customerRandomEmail !== null) {
-            $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-            $registry->unregister('isSecureArea');
-            $registry->register('isSecureArea', true);
-            $customer = $this->customerRepository->get($this->customerRandomEmail);
-            if (isset($customer) && $customer->getId()) {
-                $this->customerRepository->delete($customer);
-            }
-            $registry->unregister('isSecureArea');
-            $registry->register('isSecureArea', false);
+        $newEmail = 'customer_created_random123@example.com';
+        try {
+            $customer = $this->customerRepository->get($newEmail);
+
+        } catch (\Exception $exception) {
+            return false;
+        }
+        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+        if (isset($customer) && $customer->getId()) {
+            $this->customerRepository->delete($customer);
         }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
         parent::tearDown();
     }
 }