Merge remote-tracking branch '36623_v1/issue-36591' into comm_voted_v3

engcom-Charlie · engcom-Charlie · commit 25842ee18f48 · 2023-06-21T17:46:33.000+05:30
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -98,7 +98,7 @@ public function __construct(
     public function build(array $args, bool $includeAggregation): SearchCriteriaInterface
     {
         $searchCriteria = $this->builder->build('products', $args);
-        $isSearch = !empty($args['search']);
+        $isSearch = isset($args['search']);
         $this->updateRangeFilters($searchCriteria);
         if ($includeAggregation) {
             $attributeData = $this->eavConfig->getAttribute(Product::ENTITY, 'price');
@@ -122,7 +122,7 @@ public function build(array $args, bool $includeAggregation): SearchCriteriaInte
         }
 
         $this->addEntityIdSort($searchCriteria);
-        $this->addVisibilityFilter($searchCriteria, $isSearch, !empty($args['filter']));
+        $this->addVisibilityFilter($searchCriteria, $isSearch, !empty($args['filter']['category_id']));
 
         $searchCriteria->setCurrentPage($args['currentPage']);
         $searchCriteria->setPageSize($args['pageSize']);
diff --git a/app/code/Magento/CatalogGraphQl/Test/Unit/DataProvider/Product/SearchCriteriaBuilderTest.php b/app/code/Magento/CatalogGraphQl/Test/Unit/DataProvider/Product/SearchCriteriaBuilderTest.php
@@ -97,51 +97,63 @@ public function testBuild(): void
         $filter = $this->createMock(Filter::class);
 
         $searchCriteria = $this->getMockBuilder(SearchCriteriaInterface::class)
-                                ->disableOriginalConstructor()
-                                ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $attributeInterface = $this->getMockBuilder(Attribute::class)
-                                    ->disableOriginalConstructor()
-                                    ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
         $attributeInterface->setData(['is_filterable' => 0]);
 
         $this->builder->expects($this->any())
-                    ->method('build')
-                    ->with('products', $args)
-                    ->willReturn($searchCriteria);
+            ->method('build')
+            ->with('products', $args)
+            ->willReturn($searchCriteria);
         $searchCriteria->expects($this->any())->method('getFilterGroups')->willReturn([]);
         $this->eavConfig->expects($this->any())
-                        ->method('getAttribute')
-                        ->with(Product::ENTITY, 'price')
-                        ->willReturn($attributeInterface);
-
-        $this->sortOrderBuilder->expects($this->once())
-                                ->method('setField')
-                                ->with('_id')
-                                ->willReturnSelf();
-        $this->sortOrderBuilder->expects($this->once())
-                                ->method('setDirection')
-                                ->with('DESC')
-                                ->willReturnSelf();
-        $this->sortOrderBuilder->expects($this->any())
-                                ->method('create')
-                                ->willReturn([]);
-
-        $this->filterBuilder->expects($this->once())
-                            ->method('setField')
-                            ->with('visibility')
-                            ->willReturnSelf();
-        $this->filterBuilder->expects($this->once())
-                            ->method('setValue')
-                            ->with("")
-                            ->willReturnSelf();
-        $this->filterBuilder->expects($this->once())
-                            ->method('setConditionType')
-                            ->with('in')
-                            ->willReturnSelf();
-
-        $this->filterBuilder->expects($this->once())->method('create')->willReturn($filter);
-
+            ->method('getAttribute')
+            ->with(Product::ENTITY, 'price')
+            ->willReturn($attributeInterface);
+        $sortOrderList = ['relevance','_id'];
+        $sortIncrementIndex = 0;
+        foreach ($sortOrderList as $sortList) {
+            $this->sortOrderBuilder->expects($this->at($sortIncrementIndex++))
+                ->method('setField')
+                ->with($sortList)
+                ->willReturnSelf();
+            $this->sortOrderBuilder->expects($this->at($sortIncrementIndex++))
+                ->method('setDirection')
+                ->with('DESC')
+                ->willReturnSelf();
+            $this->sortOrderBuilder->expects($this->at($sortIncrementIndex++))
+                ->method('create')
+                ->willReturn([]);
+        }
+        $filterOrderList = [1=>'search_term', 2=>'visibility'];
+        $filterIncrementIndex = 0;
+        foreach ($filterOrderList as $index => $filterList) {
+            $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                ->method('setField')
+                ->with($filterList)
+                ->willReturnSelf();
+            $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                ->method('setValue')
+                ->with('')
+                ->willReturnSelf();
+            if ($index==2) {
+                $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                    ->method('setConditionType')
+                    ->with('in')
+                    ->willReturnSelf();
+            } else {
+                $this->filterBuilder->expects($this->at($filterIncrementIndex++))
+                    ->method('setConditionType')
+                    ->with('')
+                    ->willReturnSelf();
+            }
+
+            $this->filterBuilder->expects($this->at($filterIncrementIndex++))->method('create')->willReturn($filter);
+        }
         $this->filterGroupBuilder->expects($this->any())
             ->method('addFilter')
             ->with($filter)
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerSignInFormSection/StorefrontCustomerSignInPopupFormSection.xml
@@ -13,6 +13,6 @@
         <element name="password" type="input" selector="#pass"/>
         <element name="signIn" type="button" selector="(//button[@id='send2'][contains(@class, 'login')])[1]" timeout="30"/>
         <element name="forgotYourPassword" type="button" selector="//a[@class='action']//span[contains(text(),'Forgot Your Password?')]" timeout="30"/>
-        <element name="createAnAccount" type="button" selector="//div[contains(@class,'actions-toolbar')]//a[contains(.,'Create an Account')]" timeout="30"/>
+        <element name="createAnAccount" type="button" selector="(//div[contains(@class,'actions-toolbar')]//a[contains(.,'Create an Account')])[last()]" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
@@ -32,8 +32,8 @@
                 <h2 class="page-sub-title"><?= $block->escapeHtml(__('Partner search')) ?></h2>
                 <p>
                     <?= $block->escapeHtml(__(
-                        'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver ' .
-                        'the best possible customer experiences. They are recognized as experts in eCommerce, ' .
+                        'Magento has a thriving ecosystem of technology partners to help merchants and brands deliver '
+                        . 'the best possible customer experiences. They are recognized as experts in eCommerce, ' .
                         'search, email marketing, payments, tax, fraud, optimization and analytics, fulfillment, ' .
                         'and more. Visit the Magento Partner Directory to see all of our trusted partners.'
                     )); ?>
@@ -61,7 +61,7 @@
                 )); ?>
             </p>
             <a class="action-secondary" target="_blank"
-               href="https://marketplace.magento.com/">
+               href="https://commercemarketplace.adobe.com/">
                 <?= $block->escapeHtml(__('Visit Magento Marketplaces')) ?>
             </a>
         </div>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontGuestCheckingWithMultishipmentTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontGuestCheckingWithMultishipmentTest.xml
@@ -44,6 +44,7 @@
         </actionGroup>
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
         <click selector="{{MultishippingSection.checkoutWithMultipleAddresses}}" stepKey="proceedMultishipping"/>
+        <waitForElementClickable selector="{{StorefrontCustomerSignInPopupFormSection.createAnAccount}}" stepKey="waitForCreateAccount"/>
         <click selector="{{StorefrontCustomerSignInPopupFormSection.createAnAccount}}" stepKey="clickCreateAccount"/>
         <seeElement selector="{{CheckoutShippingSection.region}}" stepKey="seeRegionSelector"/>
     </test>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Data/UrlRewriteData.xml
@@ -28,7 +28,7 @@
     </entity>
     <entity name="customPermanentUrlRewrite" type="urlRewrite">
         <data key="request_path" unique="prefix">wishlist</data>
-        <data key="target_path">https://marketplace.magento.com/</data>
+        <data key="target_path">https://commercemarketplace.adobe.com/</data>
         <data key="redirect_type">301</data>
         <data key="redirect_type_label">Permanent (301)</data>
         <data key="store_id">1</data>
@@ -37,7 +37,7 @@
     </entity>
     <entity name="customTemporaryUrlRewrite" type="urlRewrite">
         <data key="request_path" unique="prefix">wishlist</data>
-        <data key="target_path">https://marketplace.magento.com/</data>
+        <data key="target_path">https://commercemarketplace.adobe.com/</data>
         <data key="redirect_type">302</data>
         <data key="redirect_type_label">Temporary (302)</data>
         <data key="store_id">1</data>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -2250,11 +2250,10 @@ public function testProductPartialNameFullTextSearchQuery(): void
 }
 QUERY;
         $prod1 = $this->productRepository->get('simple1');
-        $prod2 = $this->productRepository->get('simple2');
         $response = $this->graphQlQuery($query);
-        $this->assertEquals(2, $response['products']['total_count']);
+        $this->assertEquals(1, $response['products']['total_count']);
 
-        $filteredProducts = [$prod1, $prod2];
+        $filteredProducts = [$prod1];
         $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
         foreach ($productItemsInResponse as $itemIndex => $itemArray) {
             $this->assertNotEmpty($itemArray);
@@ -2337,11 +2336,10 @@ public function testProductPartialSkuFullTextSearchQuery(): void
 }
 QUERY;
         $prod1 = $this->productRepository->get('prd1sku');
-        $prod2 = $this->productRepository->get('prd2-sku2');
         $response = $this->graphQlQuery($query);
-        $this->assertEquals(2, $response['products']['total_count']);
+        $this->assertEquals(1, $response['products']['total_count']);
 
-        $filteredProducts = [$prod1, $prod2];
+        $filteredProducts = [$prod1];
         $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
         foreach ($productItemsInResponse as $itemIndex => $itemArray) {
             $this->assertNotEmpty($itemArray);
@@ -2364,14 +2362,13 @@ public function testProductPartialSkuFullTextSearchQuery(): void
     }
 
     /**
-     * Partial search on hyphenated sku filtered for price and sorted by price and sku
+     * Partial search on hyphenated sku having visibility as catalog
      *
      * @magentoApiDataFixture Magento/Catalog/_files/category.php
      * @magentoApiDataFixture Magento/Catalog/_files/multiple_products_with_different_sku_and_name.php
      */
     public function testProductPartialSkuHyphenatedFullTextSearchQuery(): void
     {
-        $prod2 = $this->productRepository->get('prd2-sku2');
         $textToSearch = 'sku2';
         $query
             = <<<QUERY
@@ -2426,28 +2423,7 @@ public function testProductPartialSkuHyphenatedFullTextSearchQuery(): void
 QUERY;
 
         $response = $this->graphQlQuery($query);
-        $this->assertEquals(1, $response['products']['total_count']);
-
-        $filteredProducts = [$prod2];
-        $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
-        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
-            $this->assertNotEmpty($itemArray);
-            $this->assertResponseFields(
-                $productItemsInResponse[$itemIndex][0],
-                [
-                    'sku' => $filteredProducts[$itemIndex]->getSku(),
-                    'name' => $filteredProducts[$itemIndex]->getName(),
-                    'price' => [
-                        'minimalPrice' => [
-                            'amount' => [
-                                'value' => $filteredProducts[$itemIndex]->getSpecialPrice(),
-                                'currency' => 'USD'
-                            ]
-                        ]
-                    ]
-                ]
-            );
-        }
+        $this->assertEquals(0, $response['products']['total_count']);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/Plugin/PluginTest.php
@@ -6,8 +6,11 @@
 namespace Magento\Newsletter\Model\Plugin;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 
 /**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * phpcs:disable Magento2.Security.Superglobal
  * @magentoAppIsolation enabled
  */
 class PluginTest extends \PHPUnit\Framework\TestCase
@@ -24,6 +27,11 @@ class PluginTest extends \PHPUnit\Framework\TestCase
      */
     protected $customerRepository;
 
+    /**
+     * @var TransportBuilderMock
+     */
+    protected $transportBuilderMock;
+
     protected function setUp(): void
     {
         $this->accountManagement = Bootstrap::getObjectManager()->get(
@@ -32,6 +40,9 @@ protected function setUp(): void
         $this->customerRepository = Bootstrap::getObjectManager()->get(
             \Magento\Customer\Api\CustomerRepositoryInterface::class
         );
+        $this->transportBuilderMock = Bootstrap::getObjectManager()->get(
+            TransportBuilderMock::class
+        );
     }
 
     protected function tearDown(): void
@@ -223,4 +234,67 @@ public function testCustomerWithTwoNewsLetterSubscriptions()
         $extensionAttributes = $customer->getExtensionAttributes();
         $this->assertTrue($extensionAttributes->getIsSubscribed());
     }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation enabled
+     * @magentoConfigFixture current_store newsletter/general/active 1
+     * @magentoDataFixture Magento/Customer/_files/customer_welcome_email_template.php
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testCreateAccountWithNewsLetterSubscription(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory */
+        $customerFactory = $objectManager->get(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class);
+        $customerDataObject = $customerFactory->create()
+            ->setFirstname('John')
+            ->setLastname('Doe')
+            ->setEmail('customer@example.com');
+        $extensionAttributes = $customerDataObject->getExtensionAttributes();
+        $extensionAttributes->setIsSubscribed(true);
+        $customerDataObject->setExtensionAttributes($extensionAttributes);
+        $this->accountManagement->createAccount($customerDataObject, '123123qW');
+        $message = $this->transportBuilderMock->getSentMessage();
+
+        $this->assertNotNull($message);
+        $this->assertEquals('Welcome to Main Website Store', $message->getSubject());
+        $this->assertStringContainsString(
+            'John',
+            $message->getBody()->getParts()[0]->getRawContent()
+        );
+        $this->assertStringContainsString(
+            'customer@example.com',
+            $message->getBody()->getParts()[0]->getRawContent()
+        );
+
+        /** @var \Magento\Newsletter\Model\Subscriber $subscriber */
+        $subscriber = $objectManager->create(\Magento\Newsletter\Model\Subscriber::class);
+        $subscriber->loadByEmail('customer@example.com');
+        $this->assertTrue($subscriber->isSubscribed());
+
+        $this->transportBuilderMock->setTemplateIdentifier(
+            'newsletter_subscription_confirm_email_template'
+        )->setTemplateVars([
+            'subscriber_data' => [
+                'confirmation_link' => $subscriber->getConfirmationLink(),
+            ],
+        ])->setTemplateOptions([
+            'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
+            'store' => \Magento\Store\Model\Store::DEFAULT_STORE_ID
+        ])
+        ->addTo('customer@example.com')
+        ->getTransport();
+
+        $message = $this->transportBuilderMock->getSentMessage();
+
+        $this->assertNotNull($message);
+        $this->assertStringContainsString(
+            $subscriber->getConfirmationLink(),
+            $message->getBody()->getParts()[0]->getRawContent()
+        );
+        $this->assertEquals('Newsletter subscription confirmation', $message->getSubject());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/MultiStoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/MultiStoreTest.php
diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserResetPasswordEmailTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/UserResetPasswordEmailTest.php
