MC-30685: Admin: Mass actions on customers grid

Author: dimonovp

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

@@ -144,12 +144,10 @@ private function performInlineEditRequest(array $params): array
     private function assertCustomersData(array $data): void
     {
         foreach ($data['items'] as $customerId => $expectedData) {
-            $customer = $this->customerRepository->getById($customerId);
-            $this->assertEquals($expectedData['email'], $customer->getEmail());
-            $this->assertEquals($expectedData['group_id'], $customer->getGroupId());
-            $this->assertEquals($expectedData['website_id'], $customer->getWebsiteId());
-            $this->assertEquals($expectedData['taxvat'], $customer->getTaxvat());
-            $this->assertEquals($expectedData['gender'], $customer->getGender());
+            $customerData = $this->customerRepository->getById($customerId)->__toArray();
+            foreach ($expectedData as $key => $value) {
+                $this->assertEquals($value, $customerData[$key]);
+            }
         }
     }
 }

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

@@ -10,8 +10,8 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory;
 use Magento\Newsletter\Model\Subscriber;
-use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
@@ -27,12 +27,12 @@ class MassUnsubscribeTest extends AbstractBackendController
     /** @var ObjectManagerInterface */
     private $objectManager;
 
-    /** @var SubscriberFactory */
-    private $subscriberFactory;
-
     /** @var CustomerRepositoryInterface */
     private $customerRepository;
 
+    /** @var CollectionFactory */
+    private $subscriberCollectionFactory;
+
     /**
      * @inheritdoc
      */
@@ -41,43 +41,35 @@ protected function setUp()
         parent::setUp();
 
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->subscriberFactory = $this->objectManager->get(SubscriberFactory::class);
+        $this->subscriberCollectionFactory = $this->objectManager->get(CollectionFactory::class);
         $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
     }
 
     /**
-     * @magentoDataFixture Magento/Newsletter/_files/two_subscribers.php
+     * @magentoDataFixture Magento/Newsletter/_files/three_subscribers.php
      *
      * @return void
      */
     public function testMassUnsubscribeAction(): void
     {
-        $firstCustomer = $this->customerRepository->get('customer@example.com');
-        $secondCustomer = $this->customerRepository->get('customer_two@example.com');
         $params = [
-            'selected' => [
-                $firstCustomer->getId(),
-                $secondCustomer->getId(),
-            ],
+            'selected' => [1, 2, 3],
             'namespace' => 'customer_listing',
         ];
         $this->getRequest()->setParams($params)->setMethod(HttpRequest::METHOD_POST);
         $this->dispatch('backend/customer/index/massUnsubscribe');
         $this->assertRedirect($this->stringContains('backend/customer/index/index'));
         $this->assertSessionMessages(
-            $this->equalTo([(string)__('A total of 2 record(s) were updated.')]),
+            $this->equalTo([(string)__('A total of 3 record(s) were updated.')]),
             MessageInterface::TYPE_SUCCESS
         );
-        $this->assertEquals(
-            Subscriber::STATUS_UNSUBSCRIBED,
-            $this->subscriberFactory->create()
-                ->loadByEmail('customer@example.com')->getSubscriberStatus()
-        );
-        $this->assertEquals(
-            Subscriber::STATUS_UNSUBSCRIBED,
-            $this->subscriberFactory->create()
-                ->loadByEmail('customer_two@example.com')->getSubscriberStatus()
-        );
+        $emails = ['customer@search.example.com', 'customer2@search.example.com', 'customer3@search.example.com'];
+        $collection = $this->subscriberCollectionFactory->create()->addFieldToFilter('subscriber_email', $emails)
+            ->addFieldToSelect('subscriber_status');
+        $this->assertCount(3, $collection);
+        foreach ($collection as $subscriber) {
+            $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getData('subscriber_status'));
+        }
     }
 
     /**

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

@@ -4,33 +4,26 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\CustomerRegistry;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Integration\Model\Oauth\Token\RequestThrottler;
-use Magento\TestFramework\Helper\Bootstrap;
 
-$objectManager = Bootstrap::getObjectManager();
-$objectManager->removeSharedInstance(CustomerRegistry::class);
-/** @var CustomerRepositoryInterface $customerRepository */
-$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
 /** @var \Magento\Framework\Registry $registry */
-$registry = $objectManager->get(\Magento\Framework\Registry::class);
-
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-try {
-    $customer = $customerRepository->get('customer@example.com');
-    $customerRepository->delete($customer);
-} catch (NoSuchEntityException $e) {
-    // Customer with the specified email does not exist
+/** @var $customer \Magento\Customer\Model\Customer*/
+$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Customer\Model\Customer::class
+);
+$customer->load(1);
+if ($customer->getId()) {
+    $customer->delete();
 }
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
 
 /* Unlock account if it was locked for tokens retrieval */
 /** @var RequestThrottler $throttler */
-$throttler = $objectManager->create(RequestThrottler::class);
+$throttler = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(RequestThrottler::class);
 $throttler->resetAuthenticationFailuresCount('customer@example.com', RequestThrottler::USER_TYPE_CUSTOMER);

dev/tests/integration/testsuite/Magento/Newsletter/_files/three_subscribers.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/Customer/_files/three_customers.php';
+
+$objectManager = Bootstrap::getObjectManager();
+$subscriberFactory = $objectManager->get(SubscriberFactory::class);
+
+$subscriberFactory->create()->subscribe('customer@search.example.com');
+$subscriberFactory->create()->subscribe('customer2@search.example.com');
+$subscriberFactory->create()->subscribe('customer3@search.example.com');

dev/tests/integration/testsuite/Magento/Newsletter/_files/two_subscribers_rollback.php renamed to dev/tests/integration/testsuite/Magento/Newsletter/_files/three_subscribers_rollback.php

@@ -5,4 +5,4 @@
  */
 declare(strict_types=1);
 
-require __DIR__ . '/../../../Magento/Customer/_files/two_customers_rollback.php';
+require __DIR__ . '/../../../Magento/Customer/_files/three_customers_rollback.php';