MC-32126: Admin: Create/update/delete customer

Author: romadjelf

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

@@ -36,7 +36,7 @@ class SaveTest extends AbstractBackendController
      *
      * @var string
      */
-    private $_baseControllerUrl = 'http://localhost/index.php/backend/customer/index/';
+    private $baseControllerUrl = 'backend/customer/index/';
 
     /** @var CustomerRepositoryInterface */
     private $customerRepository;
@@ -83,7 +83,7 @@ public function testCreateCustomer(array $postData, array $expectedData): void
             $this->equalTo([(string)__('You saved the customer.')]),
             MessageInterface::TYPE_SUCCESS
         );
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'index/key/'));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'index/key/'));
         $this->assertCustomerData(
             $postData['customer'][CustomerData::EMAIL],
             (int)$postData['customer'][CustomerData::WEBSITE_ID],
@@ -158,7 +158,7 @@ public function testCreateCustomerErrors(array $postData, array $expectedData, a
         );
         $this->assertNotEmpty($this->session->getCustomerFormData());
         $this->assertArraySubset($expectedData, $this->session->getCustomerFormData());
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'new/key/'));
     }
 
     /**
@@ -251,8 +251,8 @@ public function testUpdateCustomer(): void
             $this->equalTo([(string)__('You saved the customer.')]),
             MessageInterface::TYPE_SUCCESS
         );
-        $this->assertRedirect($this->stringStartsWith(
-            $this->_baseControllerUrl . 'edit/id/' . $customerData->getId()
+        $this->assertRedirect($this->stringContains(
+            $this->baseControllerUrl . 'edit/id/' . $customerData->getId()
         ));
         $this->assertCustomerData($customerData->getEmail(), (int)$customerData->getWebsiteId(), $expectedData);
         $this->assertCustomerSubscription(
@@ -289,7 +289,7 @@ public function testExistingCustomerUnsubscribeNewsletter(): void
             $this->equalTo([(string)__('You saved the customer.')]),
             MessageInterface::TYPE_SUCCESS
         );
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'index/key/'));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'index/key/'));
         $this->assertCustomerSubscription(
             (int)$customerData->getId(),
             (int)$customerData->getWebsiteId(),
@@ -344,7 +344,7 @@ public function testExistingCustomerChangeEmail(): void
          * Check that no errors were generated and set to session
          */
         $this->assertSessionMessages($this->isEmpty(), MessageInterface::TYPE_ERROR);
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'index/key/'));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'index/key/'));
     }
 
     /**
@@ -384,7 +384,7 @@ public function testCreateSameEmailFormatDateError(): void
             true,
             'Customer form data should be formatted'
         );
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'new/key/'));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'new/key/'));
     }
 
     /**
@@ -449,7 +449,7 @@ private function dispatchCustomerSave(array $postData, array $params = []): void
         if (!empty($params)) {
             $this->getRequest()->setParams($params);
         }
-        $this->dispatch('backend/customer/index/save');
+        $this->dispatch($this->baseControllerUrl . 'save');
     }
 
     /**

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

@@ -7,8 +7,8 @@
 namespace Magento\Customer\Controller\Adminhtml;
 
 use Magento\Backend\Model\Session;
+use Magento\Customer\Api\CustomerNameGenerationInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Helper\View;
 use Magento\Customer\Model\EmailNotification;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\Request\Http as HttpRequest;
@@ -25,23 +25,22 @@ class IndexTest extends AbstractBackendController
      *
      * @var string
      */
-    protected $_baseControllerUrl;
+    private $baseControllerUrl = 'backend/customer/index/';
 
     /** @var CustomerRepositoryInterface */
-    protected $customerRepository;
+    private $customerRepository;
 
-    /** @var View */
-    protected $customerViewHelper;
+    /** @var CustomerNameGenerationInterface */
+    private $customerViewHelper;
 
     /**
      * @inheritDoc
      */
     protected function setUp()
     {
         parent::setUp();
-        $this->_baseControllerUrl = 'http://localhost/index.php/backend/customer/index/';
         $this->customerRepository = $this->_objectManager->get(CustomerRepositoryInterface::class);
-        $this->customerViewHelper = $this->_objectManager->get(View::class);
+        $this->customerViewHelper = $this->_objectManager->get(CustomerNameGenerationInterface::class);
     }
 
     /**
@@ -173,7 +172,7 @@ public function testResetPasswordActionNoCustomerId()
         // No customer ID in post, will just get redirected to base
         $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
         $this->dispatch('backend/customer/index/resetPassword');
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl));
     }
 
     /**
@@ -185,7 +184,7 @@ public function testResetPasswordActionBadCustomerId()
         $this->getRequest()->setMethod(HttpRequest::METHOD_GET);
         $this->getRequest()->setPostValue(['customer_id' => '789']);
         $this->dispatch('backend/customer/index/resetPassword');
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl));
     }
 
     /**
@@ -200,7 +199,7 @@ public function testResetPasswordActionSuccess()
             $this->equalTo(['The customer will receive an email with a link to reset password.']),
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
-        $this->assertRedirect($this->stringStartsWith($this->_baseControllerUrl . 'edit'));
+        $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'edit'));
     }
 
     /**