MAGETWO-97195: Automate with Integration test Confirmation email should be delivered to the customer when address contains '+' symbol

Author: DianaRusin

dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

@@ -38,6 +38,9 @@ class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
      */
     private $transportBuilderMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -682,10 +685,7 @@ public function testConfirmationEmailWithSpecialCharacters()
         $this->assertContains('To: ' . $email, $rawMessage);
 
         $content = $message->getBody()->getPartContent(0);
-        preg_match('<a\s*href="(?<url>.*?)".*>', $content, $matches);
-        $confirmationUrl = $matches['url'];
-        $confirmationUrl = str_replace('http://localhost/index.php/','',$confirmationUrl);
-        $confirmationUrl = html_entity_decode($confirmationUrl);
+        $confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
         $this->setRequestInfo($confirmationUrl, 'confirm');
         $this->clearCookieMessagesList();
         $this->dispatch($confirmationUrl);
@@ -844,4 +844,23 @@ private function clearCookieMessagesList()
             $jsonSerializer->serialize([])
         );
     }
+
+    /**
+     * Get confirmation URL from message content.
+     *
+     * @param string $content
+     * @return string
+     */
+    private function getConfirmationUrlFromMessageContent(string $content)
+    {
+        $confirmationUrl = '';
+
+        if (preg_match('<a\s*href="(?<url>.*?)".*>', $content, $matches)) {
+            $confirmationUrl = $matches['url'];
+            $confirmationUrl = str_replace('http://localhost/index.php/', '', $confirmationUrl);
+            $confirmationUrl = html_entity_decode($confirmationUrl);
+        }
+
+        return $confirmationUrl;
+    }
 }

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

@@ -13,12 +13,6 @@
 $objectManager = Bootstrap::getObjectManager();
 $mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
 
-$this->confirmationConfigScopeValue = $mutableScopeConfig->getValue(
-    'customer/create_account/confirm',
-    ScopeInterface::SCOPE_WEBSITES,
-    null
-);
-
 $mutableScopeConfig->setValue(
     'customer/create_account/confirm',
     0,

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

@@ -6,23 +6,18 @@
 
 declare(strict_types=1);
 
-use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Config\Model\ResourceModel\Config;
 use Magento\Framework\Registry;
-use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /** @var Registry $registry */
 $registry = Bootstrap::getObjectManager()->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-$mutableScopeConfig = Bootstrap::getObjectManager()->create(MutableScopeConfigInterface::class);
-$mutableScopeConfig->setValue(
-    'customer/create_account/confirm',
-    $this->confirmationConfigScopeValue,
-    ScopeInterface::SCOPE_WEBSITES,
-    null
-);
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);

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

@@ -13,12 +13,6 @@
 $objectManager = Bootstrap::getObjectManager();
 $mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
 
-$this->confirmationConfigScopeValue = $mutableScopeConfig->getValue(
-    'customer/create_account/confirm',
-    ScopeInterface::SCOPE_WEBSITES,
-    null
-);
-
 $mutableScopeConfig->setValue(
     'customer/create_account/confirm',
     1,

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

@@ -6,23 +6,18 @@
 
 declare(strict_types=1);
 
-use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Config\Model\ResourceModel\Config;
 use Magento\Framework\Registry;
-use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /** @var Registry $registry */
 $registry = Bootstrap::getObjectManager()->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-$mutableScopeConfig = Bootstrap::getObjectManager()->create(MutableScopeConfigInterface::class);
-$mutableScopeConfig->setValue(
-    'customer/create_account/confirm',
-    $this->confirmationConfigScopeValue,
-    ScopeInterface::SCOPE_WEBSITES,
-    null
-);
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);

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

@@ -6,28 +6,32 @@
 
 declare(strict_types=1);
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Customer;
 use Magento\TestFramework\Helper\Bootstrap;
 
 include __DIR__ . '/customer_confirmation_config_enable.php';
 
 $objectManager = Bootstrap::getObjectManager();
+
 /** @var Customer $customer */
 $customer = $objectManager->create(Customer::class);
-$customer->setWebsiteId(1)
-    ->setId(1)
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+/** @var CustomerInterface $customerInterface */
+$customerInterface = $objectManager->create(CustomerInterface::class);
+
+$customerInterface->setWebsiteId(1)
     ->setEmail('customer+confirmation@example.com')
-    ->setPassword('password')
     ->setConfirmation($customer->getRandomConfirmationKey())
     ->setGroupId(1)
     ->setStoreId(1)
-    ->setIsActive(1)
     ->setFirstname('John')
     ->setLastname('Smith')
     ->setDefaultBilling(1)
     ->setDefaultShipping(1)
     ->setTaxvat('12')
     ->setGender(0);
 
-$customer->isObjectNew(true);
-$customer->save();
+$customerRepository->save($customerInterface, 'password');

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

@@ -8,20 +8,21 @@
 
 include __DIR__ . '/customer_confirmation_config_enable_rollback.php';
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Customer\Model\Customer;
 
 /** @var Registry $registry */
 $registry = Bootstrap::getObjectManager()->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var Customer $customer */
-$customer = Bootstrap::getObjectManager()->create(Customer::class);
-$customer->load(1);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->create(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer+confirmation@example.com');
+
 if ($customer->getId()) {
-    $customer->delete();
+    $customerRepository->delete($customer);
 }
 
 $registry->unregister('isSecureArea');