MC-16365: [2.1.x] Fix CompanyUserManagerInterfaceTest failing on mainline

Author: svitja

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribeTest.php

@@ -39,7 +39,7 @@ protected function tearDown()
     }
 
     /**
-     * @magentoDataFixture Magento/Customer/_files/two_customers.php
+     * @magentoDataFixture Magento/Customer/_files/two_customers_with_reindex.php
      */
     public function testMassUnsubscribAction()
     {

dev/tests/integration/testsuite/Magento/Customer/_files/two_customers.php

@@ -6,10 +6,6 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Framework\Indexer\IndexerInterface;
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Customer\Model\Customer;
-
 require 'customer.php';
 
 $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Customer\Model\Customer');
@@ -29,12 +25,3 @@
 
 $customer->isObjectNew(true);
 $customer->save();
-
-/** @var IndexerRegistry $indexerRegistry */
-$indexerRegistry = $objectManager->create(IndexerRegistry::class);
-/** @var IndexerInterface $indexer */
-$indexer = $indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
-try {
-    $indexer->reindexAll();
-} catch (\Exception $e) {
-}

dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_with_reindex.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Fixture for Customer List method.
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Customer\Model\Customer;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var $repository \Magento\Customer\Api\CustomerRepositoryInterface */
+$repository = $objectManager->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+$customer = $objectManager->create(\Magento\Customer\Model\Customer::class);
+
+/** @var Magento\Customer\Model\Customer $customer */
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEmail('customer_1@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customer->isObjectNew(true);
+$customer->save();
+
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Customer\Model\Customer::class);
+$customer->setWebsiteId(1)
+    ->setEntityId(2)
+    ->setEntityTypeId(1)
+    ->setAttributeSetId(0)
+    ->setEmail('customer_2@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setFirstname('Firstname')
+    ->setLastname('Lastname')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1);
+
+$customer->isObjectNew(true);
+$customer->save();
+
+/** @var IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->create(IndexerRegistry::class);
+/** @var IndexerInterface $indexer */
+$indexer = $indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
+try {
+    $indexer->reindexAll();
+} catch (\Exception $e) {
+}

dev/tests/integration/testsuite/Magento/Customer/_files/two_customers_with_reindex_rollback.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Customer\Model\Customer;
+
+/** @var \Magento\Framework\Registry $registry */
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+try {
+    $customer = $customerRepository->get('customer_1@example.com');
+    $customerRepository->delete($customer);
+} catch (NoSuchEntityException $e) {
+    /** Tests which are wrapped with MySQL transaction clear all data by transaction rollback. */
+}
+
+try {
+    $customer = $customerRepository->get('customer_2@example.com');
+    $customerRepository->delete($customer);
+} catch (NoSuchEntityException $e) {
+    /** Tests which are wrapped with MySQL transaction clear all data by transaction rollback. */
+}
+
+/** @var IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->create(IndexerRegistry::class);
+/** @var IndexerInterface $indexer */
+$indexer = $indexerRegistry->get(Customer::CUSTOMER_GRID_INDEXER_ID);
+try {
+    $indexer->reindexAll();
+} catch (\Exception $e) {
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);