Merge remote-tracking branch 'origin/MAGETWO-48021' into MAGETWO-47783

Author: maxwhite-ua

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php

@@ -36,6 +36,9 @@ class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendControlle
     /** @var \Magento\Framework\Data\Form\FormKey */
     protected $formKey;
 
+    /** @var \Magento\TestFramework\ObjectManager */
+    protected $objectManager;
+
     protected function setUp()
     {
         parent::setUp();
@@ -53,6 +56,8 @@ protected function setUp()
         $this->formKey = Bootstrap::getObjectManager()->get(
             'Magento\Framework\Data\Form\FormKey'
         );
+
+        $this->objectManager = Bootstrap::getObjectManager();
     }
 
     protected function tearDown()
@@ -98,7 +103,7 @@ public function testSaveActionWithInvalidFormData()
          */
         $this->assertEquals(
             $post,
-            Bootstrap::getObjectManager()->get('Magento\Backend\Model\Session')->getCustomerData()
+            $this->objectManager->get('Magento\Backend\Model\Session')->getCustomerData()
         );
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
     }
@@ -134,7 +139,7 @@ public function testSaveActionWithInvalidCustomerAddressData()
          */
         $this->assertEquals(
             $post,
-            Bootstrap::getObjectManager()->get('Magento\Backend\Model\Session')->getCustomerData()
+            $this->objectManager->get('Magento\Backend\Model\Session')->getCustomerData()
         );
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new'));
     }
@@ -144,9 +149,6 @@ public function testSaveActionWithInvalidCustomerAddressData()
      */
     public function testSaveActionWithValidCustomerDataAndValidAddressData()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
-
         $post = [
             'customer' => [
                 'middlename' => 'test middlename',
@@ -176,7 +178,7 @@ public function testSaveActionWithValidCustomerDataAndValidAddressData()
         $this->getRequest()->setParam('back', '1');
 
         // Emulate setting customer data to session in editAction
-        $objectManager->get('Magento\Backend\Model\Session')->setCustomerData($post);
+        $this->objectManager->get('Magento\Backend\Model\Session')->setCustomerData($post);
 
         $this->dispatch('backend/customer/index/save');
         /**
@@ -187,7 +189,7 @@ public function testSaveActionWithValidCustomerDataAndValidAddressData()
         /**
          * Check that customer data were cleaned after it was saved successfully
          */
-        $this->assertEmpty($objectManager->get('Magento\Backend\Model\Session')->getCustomerData());
+        $this->assertEmpty($this->objectManager->get('Magento\Backend\Model\Session')->getCustomerData());
 
         /**
          * Check that success message is set
@@ -200,7 +202,7 @@ public function testSaveActionWithValidCustomerDataAndValidAddressData()
         /**
          * Check that customer id set and addresses saved
          */
-        $registry = $objectManager->get('Magento\Framework\Registry');
+        $registry = $this->objectManager->get('Magento\Framework\Registry');
         $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
         $customer = $this->customerRepository->getById($customerId);
         $this->assertEquals('test firstname', $customer->getFirstname());
@@ -214,7 +216,7 @@ public function testSaveActionWithValidCustomerDataAndValidAddressData()
         );
 
         /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
+        $subscriber = $this->objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
         $this->assertEmpty($subscriber->getId());
         $subscriber->loadByCustomerId($customerId);
         $this->assertEmpty($subscriber->getId());
@@ -280,21 +282,15 @@ public function testSaveActionExistingCustomerAndExistingAddressData()
         $this->getRequest()->setPostValue($post);
         $this->getRequest()->setParam('id', 1);
         $this->dispatch('backend/customer/index/save');
-        /**
-         * Check that success message is set
-         */
+
+        /** Check that success message is set */
         $this->assertSessionMessages(
             $this->equalTo(['You saved the customer.']),
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
 
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
-
-        /**
-         * Check that customer id set and addresses saved
-         */
-        $registry = $objectManager->get('Magento\Framework\Registry');
+        /** Check that customer id set and addresses saved */
+        $registry = $this->objectManager->get('Magento\Framework\Registry');
         $customerId = $registry->registry(RegistryConstants::CURRENT_CUSTOMER_ID);
         $customer = $this->customerRepository->getById($customerId);
         $this->assertEquals('test firstname', $customer->getFirstname());
@@ -315,12 +311,11 @@ public function testSaveActionExistingCustomerAndExistingAddressData()
         $this->assertEquals('new firstname', $newAddress->getFirstname());
 
         /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
+        $subscriber = $this->objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
         $this->assertEmpty($subscriber->getId());
         $subscriber->loadByCustomerId($customerId);
         $this->assertNotEmpty($subscriber->getId());
         $this->assertEquals(1, $subscriber->getStatus());
-
         $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'index/key/'));
     }
 
@@ -330,11 +325,9 @@ public function testSaveActionExistingCustomerAndExistingAddressData()
     public function testSaveActionExistingCustomerUnsubscribeNewsletter()
     {
         $customerId = 1;
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = Bootstrap::getObjectManager();
 
         /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
+        $subscriber = $this->objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
         $this->assertEmpty($subscriber->getId());
         $subscriber->loadByCustomerId($customerId);
         $this->assertNotEmpty($subscriber->getId());
@@ -349,7 +342,7 @@ public function testSaveActionExistingCustomerUnsubscribeNewsletter()
         $this->dispatch('backend/customer/index/save');
 
         /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
-        $subscriber = $objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
+        $subscriber = $this->objectManager->get('Magento\Newsletter\Model\SubscriberFactory')->create();
         $this->assertEmpty($subscriber->getId());
         $subscriber->loadByCustomerId($customerId);
         $this->assertNotEmpty($subscriber->getId());