Merge remote-tracking branch 'origin/MC-20624' into 2.3-develop-pr85

Author: zakdma

dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers.php

@@ -3,16 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-$customers = [];
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\Registry;
+
+/** @var $objectManager ObjectManagerInterface */
+$objectManager = Bootstrap::getObjectManager();
+
+$customers = [];
+$customer = $objectManager->create(Customer::class);
 
 $customer->setWebsiteId(
     1
-)->setEntityId(
-    1
 )->setEntityTypeId(
     1
 )->setAttributeSetId(
@@ -40,13 +44,9 @@
 $customer->save();
 $customers[] = $customer;
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
+$customer = $objectManager->create(Customer::class);
 $customer->setWebsiteId(
     1
-)->setEntityId(
-    2
 )->setEntityTypeId(
     1
 )->setAttributeSetId(
@@ -74,13 +74,9 @@
 $customer->save();
 $customers[] = $customer;
 
-$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\Customer\Model\Customer::class
-);
+$customer = $objectManager->create(Customer::class);
 $customer->setWebsiteId(
     1
-)->setEntityId(
-    3
 )->setEntityTypeId(
     1
 )->setAttributeSetId(
@@ -108,9 +104,7 @@
 $customer->save();
 $customers[] = $customer;
 
-/** @var $objectManager \Magento\TestFramework\ObjectManager */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$objectManager->get(\Magento\Framework\Registry::class)
+$objectManager->get(Registry::class)
     ->unregister('_fixture/Magento_ImportExport_Customer_Collection');
-$objectManager->get(\Magento\Framework\Registry::class)
+$objectManager->get(Registry::class)
     ->register('_fixture/Magento_ImportExport_Customer_Collection', $customers);

dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customers_rollback.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Model\Customer;
+
+/** @var $objectManager ObjectManagerInterface */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var $registry Registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $customer Customer */
+$customer = $objectManager->create(Customer::class);
+
+$emailsToDelete = [
+    'customer@example.com',
+    'julie.worrell@example.com',
+    'david.lamar@example.com',
+];
+foreach ($emailsToDelete as $email) {
+    try {
+        $customer->loadByEmail($email)->delete();
+    } catch (\Exception $e) {
+    }
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+$registry->unregister('_fixture/Magento_ImportExport_Customer_Collection');