Merge remote-tracking branch 'mainline-ce/2.4-develop' into MC-35827-2

Author: adifucan

dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php

@@ -46,6 +46,8 @@ class StaticProperties
         \Magento\TestFramework\Annotation\AppIsolation::class,
         \Magento\TestFramework\Workaround\Cleanup\StaticProperties::class,
         \Magento\Framework\Phrase::class,
+        \Magento\TestFramework\Workaround\Override\Fixture\ResolverInterface::class,
+        \Magento\TestFramework\Workaround\Override\ConfigInterface::class,
     ];
 
     private const CACHE_NAME = 'integration_test_static_properties';

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$defaultWebsiteId = $websiteRepository->get('base')->getId();
+/** @var DefaultCategory $defaultCategory */
+$defaultCategory = $objectManager->get(DefaultCategory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+$product = $productFactory->create();
+$productData = [
+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
+    ProductInterface::ATTRIBUTE_SET_ID => $product->getDefaultAttributeSetId(),
+    ProductInterface::SKU => 'product_disabled',
+    ProductInterface::NAME => 'Product with category',
+    ProductInterface::PRICE => 10,
+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
+    ProductInterface::STATUS => Status::STATUS_DISABLED,
+    'website_ids' => [$defaultWebsiteId],
+    'stock_data' => [
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ],
+    'category_ids' => [$defaultCategory->getId()],
+];
+$product->setData($productData);
+
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled_rollback.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('product_disabled');
+} catch (NoSuchEntityException $e) {
+    // product already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

dev/tests/integration/testsuite/Magento/Customer/Model/EmailNotificationTest.php

@@ -141,6 +141,36 @@ public function testRemindPasswordCustomTemplate(): void
         $this->assertMessage($expectedSender);
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testChangeEmailCustomTemplate(): void
+    {
+        $this->setEmailTemplateConfig(EmailNotification::XML_PATH_CHANGE_EMAIL_TEMPLATE);
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customer->setEmail('customer_update@example.com');
+        $this->emailNotification->credentialsChanged($customer, 'customer@example.com');
+        $expectedSender = ['name' => 'CustomerSupport', 'email' => 'support@example.com'];
+        $this->assertMessage($expectedSender);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testChangeEmailAndPasswordCustomTemplate(): void
+    {
+        $this->setEmailTemplateConfig(EmailNotification::XML_PATH_CHANGE_EMAIL_AND_PASSWORD_TEMPLATE);
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customer->setEmail('customer_update@example.com');
+        $this->emailNotification->credentialsChanged($customer, 'customer@example.com', true);
+        $expectedSender = ['name' => 'CustomerSupport', 'email' => 'support@example.com'];
+        $this->assertMessage($expectedSender);
+    }
+
     /**
      * Assert message.
      *