MC-40099: Changing groupId functionality on createAccount()

Author: Mark Berube

app/code/Magento/Customer/Model/AccountManagement.php

@@ -423,6 +423,7 @@ class AccountManagement implements AccountManagementInterface
      * @param GetCustomerByToken|null $getByToken
      * @param AllowedCountries|null $allowedCountriesReader
      * @param SessionCleanerInterface|null $sessionCleaner
+     * @param AuthorizationInterface|null $authorization
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -463,7 +464,8 @@ public function __construct(
         AddressRegistry $addressRegistry = null,
         GetCustomerByToken $getByToken = null,
         AllowedCountries $allowedCountriesReader = null,
-        SessionCleanerInterface $sessionCleaner = null
+        SessionCleanerInterface $sessionCleaner = null,
+        AuthorizationInterface $authorization = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -503,6 +505,7 @@ public function __construct(
         $this->allowedCountriesReader = $allowedCountriesReader
             ?: $objectManager->get(AllowedCountries::class);
         $this->sessionCleaner = $sessionCleaner ?? $objectManager->get(SessionCleanerInterface::class);
+        $this->authorization = $authorization ?? $objectManager->get(AuthorizationInterface::class);
     }
 
     /**
@@ -521,22 +524,6 @@ private function getAuthentication()
         }
     }
 
-    /**
-     * Get authorization
-     *
-     * @return AuthorizationInterface
-     */
-    private function getAuthorization()
-    {
-        if (!($this->authorization instanceof AuthorizationInterface)) {
-            $this->authorization = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                AuthorizationInterface::class
-            );
-        }
-
-        return $this->authorization;
-    }
-
     /**
      * @inheritdoc
      */
@@ -862,9 +849,8 @@ public function getConfirmationStatus($customerId)
      */
     public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
     {
-        $auth = $this->getAuthorization();
         $groupId = $customer->getGroupId();
-        if (isset($groupId) && !$auth->isAllowed(self::ADMIN_RESOURCE)) {
+        if (isset($groupId) && !$this->authorization->isAllowed(self::ADMIN_RESOURCE)) {
             $customer->setGroupId(null);
         }
 

dev/tests/integration/testsuite/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/InfoTest.php

@@ -5,11 +5,19 @@
  */
 namespace Magento\Paypal\Block\Adminhtml\Billing\Agreement\View\Tab;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
+/**
+ * Testing Info tab
+ *
+ * @magentoAppArea adminhtml
+ */
 class InfoTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Paypal/_files/billing_agreement.php
+     * @magentoAppIsolation enabled
      */
     public function testCustomerGridAction()
     {