GraphQL-469: Tests data rollback for \Magento\GraphQl\Customer\CreateCustomerTest::testCreateCustomerAccountWithPassword

Author: naydav

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

@@ -8,16 +8,16 @@
 namespace Magento\GraphQl\Customer;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class CreateCustomerTest extends GraphQlAbstract
 {
     /**
-     * @var CustomerRegistry
+     * @var Registry
      */
-    private $customerRegistry;
+    private $registry;
 
     /**
      * @var CustomerRepositoryInterface
@@ -28,7 +28,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
         $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
     }
 
@@ -40,7 +40,7 @@ public function testCreateCustomerAccountWithPassword()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -50,7 +50,7 @@ public function testCreateCustomerAccountWithPassword()
             lastname: "{$newLastname}"
             email: "{$newEmail}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -78,7 +78,7 @@ public function testCreateCustomerAccountWithoutPassword()
     {
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -87,7 +87,7 @@ public function testCreateCustomerAccountWithoutPassword()
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
             email: "{$newEmail}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -151,7 +151,7 @@ public function testCreateCustomerIfEmailMissed()
             firstname: "{$newFirstname}"
             lastname: "{$newLastname}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -186,7 +186,7 @@ public function testCreateCustomerIfEmailIsNotValid()
             lastname: "{$newLastname}"
             email: "{$newEmail}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -211,7 +211,7 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
         $currentPassword = 'test123#';
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@example.com';
 
         $query = <<<QUERY
 mutation {
@@ -222,7 +222,7 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
             test123: "123test123"
             email: "{$newEmail}"
             password: "{$currentPassword}"
-          	is_subscribed: true
+            is_subscribed: true
         }
     ) {
         customer {
@@ -240,21 +240,18 @@ public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
 
     public function tearDown()
     {
-        $newEmail = 'customer_created_random123@example.com';
+        $newEmail = 'new_customer@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);
+            return;
         }
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', false);
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        $this->customerRepository->delete($customer);
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
         parent::tearDown();
     }
 }