Merge branch 'community-features-252' of github.com:swnsma/magento2-1 into community-features-252

Author: oleksandrkravchuk

app/code/Magento/CatalogImportExport/Model/Import/Product/StatusProcessor.php

@@ -101,7 +101,8 @@ public function loadOldStatus(array $linkIdBySku): void
         $select = $connection->select()
             ->from($this->getAttribute()->getBackend()->getTable())
             ->columns([$linkId, 'store_id', 'value'])
-            ->where(sprintf('%s IN (?)', $linkId), array_values($linkIdBySku));
+            ->where(sprintf('%s IN (?)', $linkId), array_values($linkIdBySku))
+            ->where('attribute_id = ?', $this->getAttribute()->getId());
         $skuByLinkId = array_flip($linkIdBySku);
 
         foreach ($connection->fetchAll($select) as $item) {

app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml

@@ -44,6 +44,7 @@
             <argument name="productVar" value="$createProduct$"/>
         </actionGroup>
         <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logout"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogoutBeforeCheck"/>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="navigateToCustomerEditPage">
             <argument name="customer" value="$createCustomer$"/>

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductDeleteTest.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test that product is not present in GQL after it was deleted
+ */
+class ProductDeleteTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     */
+    public function testQuerySimpleProductAfterDelete()
+    {
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}})
+    {
+        items {
+            attribute_set_id
+        }
+    }
+}
+QUERY;
+        // get customer ID token
+        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = $this->objectManager->create(
+            \Magento\Integration\Api\CustomerTokenServiceInterface::class
+        );
+        $customerToken = $customerTokenService->createCustomerAccessToken('[email protected]', 'password');
+
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertCount(1, $response['products']['items']);
+
+        // Delete the product and verify it is actually not accessible via the storefront anymore
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+
+        $registry = ObjectManager::getInstance()->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+        $productRepository->deleteById($productSku);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertCount(0, $response['products']['items']);
+    }
+}

dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php

@@ -50,6 +50,7 @@ protected function setUp(): void
      *
      * @magentoApiDataFixture Magento/SalesRule/_files/rules_rollback.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
+     * @magentoAppIsolation enabled
      */
     public function testGetList()
     {
@@ -87,6 +88,7 @@ public function testGetList()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/invoice.php
+     * @magentoAppIsolation enabled
      */
     public function testAutoGeneratedGetList()
     {
@@ -131,6 +133,7 @@ public function testAutoGeneratedGetList()
      * Test get list of orders with extension attributes.
      *
      * @magentoApiDataFixture Magento/Sales/_files/order.php
+     * @magentoAppIsolation enabled
      */
     public function testGetOrdertList()
     {

dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php

@@ -58,7 +58,14 @@ protected function setUp(): void
         parent::setUp();
 
         $this->_objectManager->get(\Magento\Backend\Model\UrlInterface::class)->turnOffSecretKey();
-
+        /**
+         * Authorization can be created on test bootstrap...
+         * If it will be created on test bootstrap we will have invalid RoleLocator object.
+         * As tests by default are run not from adminhtml area...
+         */
+        \Magento\TestFramework\ObjectManager::getInstance()->removeSharedInstance(
+            \Magento\Framework\Authorization::class
+        );
         $this->_auth = $this->_objectManager->get(\Magento\Backend\Model\Auth::class);
         $this->_session = $this->_auth->getAuthStorage();
         $credentials = $this->_getAdminCredentials();

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php

@@ -220,11 +220,13 @@ protected function getOptionValueByLabel(string $attributeCode, string $label):
     /**
      * Returns product for testing.
      *
+     * @param bool $forceReload
      * @return ProductInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    protected function getProduct(): ProductInterface
+    protected function getProduct($forceReload = false): ProductInterface
     {
-        return $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID);
+        return $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID, $forceReload);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.php

@@ -33,7 +33,8 @@ public function testModifyMeta(): void
     public function testModifyData(): void
     {
         $expectedData = include __DIR__ . '/../_files/eav_expected_data_output.php';
-        $this->callModifyDataAndAssert($this->getProduct(), $expectedData);
+        // force load: ProductRepositoryInterface::getList does not add stock item, prices, categories to product
+        $this->callModifyDataAndAssert($this->getProduct(true), $expectedData);
     }
 
     /**

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

@@ -22,3 +22,5 @@
 if ($category->getId()) {
     $category->delete();
 }
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

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

@@ -5,13 +5,14 @@
  */
 declare(strict_types=1);
 
-use Magento\Eav\Api\AttributeRepositoryInterface;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\TestFramework\Helper\CacheCleaner;
+
 $eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
 
 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
@@ -28,11 +29,5 @@
 /** @var AttributeRepositoryInterface $attributeRepository */
 $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
 $attributeRepository->save($attribute);
+
 CacheCleaner::cleanAll();
-/** @var \Magento\Indexer\Model\Indexer\Collection $indexerCollection */
-$indexerCollection = Bootstrap::getObjectManager()->get(\Magento\Indexer\Model\Indexer\Collection::class);
-$indexerCollection->load();
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-foreach ($indexerCollection->getItems() as $indexer) {
-    $indexer->reindexAll();
-}

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

@@ -13,7 +13,7 @@
     ->setName('Simple Product1')
     ->setSku('simple1')
     ->setTaxClassId('none')
-    ->setDescription('description')
+    ->setDescription('description uniqueword')
     ->setShortDescription('short description')
     ->setOptionsContainer('container1')
     ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)