Merge pull request #4575 from magento-tsg/2.3.3-develop-pr58

[TSG] Fixes for 2.3 (pr58) (2.3.3-develop)

Author: zakdma

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml

@@ -18,7 +18,7 @@
         </annotations>
 
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <magentoCLI command="downloadable:domains:add" arguments="example.com static.magento.com" stepKey="addDownloadableDomain"/>
             <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct">
                 <field key="price">20.00</field>
             </createData>
@@ -38,10 +38,12 @@
             </createData>
         </before>
         <after>
+            <magentoCLI command="downloadable:domains:remove" arguments="example.com static.magento.com" stepKey="removeDownloadableDomain"/>
             <deleteData createDataKey="createDownloadableProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="virtualProduct" stepKey="deleteVirtualProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
@@ -106,6 +108,9 @@
         <seeElement selector="{{StorefrontMiniCartSection.emptyMiniCart}}"  stepKey="assertEmptyCart" />
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
+        <!-- Login to Admin Page -->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+
         <!-- Open Order Index Page -->
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
         <waitForPageLoad stepKey="waitForPageLoad5"/>
@@ -127,4 +132,4 @@
         <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$15.00" stepKey="seeGrandTotal"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Pending" stepKey="seeOrderStatus"/>
     </test>
-</tests>
+</tests>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesGridActionsSection.xml

@@ -17,5 +17,6 @@
         <element name="filters" type="button" selector="button[data-action='grid-filter-expand']" timeout="30"/>
         <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']" timeout="30"/>
         <element name="headerRow" type="text" selector=".admin__data-grid-header-row.row.row-gutter"/>
+        <element name="clearFilter" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current button.action-clear" timeout="30"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml

@@ -85,6 +85,7 @@
         <see selector="{{AdminCustomerAddressesDefaultBillingSection.addressDetails}}" userInput="{{US_Address_CA.telephone}}" stepKey="seePhoneNumberInDefaultAddressSection"/>
 
         <!--Assert Customer Address Grid -->
+        <conditionalClick selector="{{AdminCustomerAddressesGridActionsSection.clearFilter}}" dependentSelector="{{AdminCustomerAddressesGridActionsSection.clearFilter}}" visible="true" stepKey="clearAddressesGridFilter"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.street}}" stepKey="seeStreetAddress"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.city}}" stepKey="seeCity"/>
         <see selector="{{AdminCustomerAddressesGridSection.customerAddressGrid}}" userInput="{{US_Address_CA.country}}" stepKey="seeCountry"/>

app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File/Upload.php

@@ -7,6 +7,8 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class Upload
@@ -76,23 +78,27 @@ public function __construct(
      */
     public function execute()
     {
-        $type = $this->getRequest()->getParam('type');
-        $tmpPath = '';
-        if ($type == 'samples') {
-            $tmpPath = $this->_sample->getBaseTmpPath();
-        } elseif ($type == 'links') {
-            $tmpPath = $this->_link->getBaseTmpPath();
-        } elseif ($type == 'link_samples') {
-            $tmpPath = $this->_link->getBaseSampleTmpPath();
-        }
-
         try {
+            $type = $this->getRequest()->getParam('type');
+            $tmpPath = '';
+            if ($type === 'samples') {
+                $tmpPath = $this->_sample->getBaseTmpPath();
+            } elseif ($type === 'links') {
+                $tmpPath = $this->_link->getBaseTmpPath();
+            } elseif ($type === 'link_samples') {
+                $tmpPath = $this->_link->getBaseSampleTmpPath();
+            } else {
+                throw new LocalizedException(__('Upload type can not be determined.'));
+            }
+
             $uploader = $this->uploaderFactory->create(['fileId' => $type]);
 
             $result = $this->_fileHelper->uploadFromTmp($tmpPath, $uploader);
 
             if (!$result) {
-                throw new \Exception('File can not be moved from temporary folder to the destination folder.');
+                throw new FileSystemException(
+                    __('File can not be moved from temporary folder to the destination folder.')
+                );
             }
 
             unset($result['tmp_name'], $result['path']);
@@ -101,7 +107,7 @@ public function execute()
                 $relativePath = rtrim($tmpPath, '/') . '/' . ltrim($result['file'], '/');
                 $this->storageDatabase->saveFile($relativePath);
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
 

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php

@@ -11,7 +11,9 @@
 use Magento\Eav\Model\Entity\Attribute as EntityAttribute;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
  * EAV attribute resource model
@@ -20,7 +22,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Attribute extends AbstractDb
 {
     /**
      * Eav Entity attributes cache
@@ -189,6 +191,23 @@ protected function _beforeSave(AbstractModel $object)
         return parent::_beforeSave($object);
     }
 
+    /**
+     * @inheritdoc
+     *
+     * @param AbstractModel $attribute
+     * @return AbstractDb
+     * @throws CouldNotDeleteException
+     */
+    protected function _beforeDelete(AbstractModel $attribute)
+    {
+        /** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+        if ($attribute->getId() && !$attribute->getIsUserDefined()) {
+            throw new CouldNotDeleteException(__("The system attribute can't be deleted."));
+        }
+
+        return parent::_beforeDelete($attribute);
+    }
+
     /**
      * Save additional attribute data after save attribute
      *

app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml

@@ -19,6 +19,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI command="downloadable:domains:add" arguments="example.com static.magento.com" stepKey="addDownloadableDomain"/>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
             <createData entity="ApiCategory" stepKey="createCategory"/>
 
@@ -207,6 +208,7 @@
             <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRate"/>
         </before>
         <after>
+            <magentoCLI command="downloadable:domains:remove" arguments="example.com static.magento.com" stepKey="removeDownloadableDomain"/>
             <deleteData createDataKey="downloadableProduct" stepKey="deleteProduct"/>
 
             <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
@@ -275,4 +277,4 @@
         <see userInput="Flat Rate - Fixed" selector="{{StorefrontOrderDetailsSection.shippingMethod}}" stepKey="assertShippingMethodOnPrintOrder"/>
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
     </test>
-</tests>
+</tests>

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php

@@ -4,12 +4,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Catalog\Api;
 
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
-use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * API tests for \Magento\Catalog\Model\Product\Attribute\Repository.
+ */
 class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductAttributeRepositoryV1';
@@ -130,6 +131,7 @@ public function testCreateWithExceptionIfAttributeAlreadyExists()
         try {
             $this->createAttribute($attributeCode);
             $this->fail("Expected exception");
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
         } catch (\SoapFault $e) {
             //Expects soap exception
         } catch (\Exception $e) {
@@ -320,6 +322,20 @@ public function testDeleteById()
         $this->assertTrue($this->deleteAttribute($attributeCode));
     }
 
+    /**
+     * Trying to delete system attribute.
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_system_attribute.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The system attribute can't be deleted.
+     * @return void
+     */
+    public function testDeleteSystemAttributeById(): void
+    {
+        $attributeCode = 'test_attribute_code_333';
+        $this->deleteAttribute($attributeCode);
+    }
+
     /**
      * @return void
      */

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php

@@ -62,6 +62,7 @@ class Item extends Sidebar
      */
     public function removeItemFromMiniCart()
     {
+        $this->waitForDeleteButtonVisible();
         $this->_rootElement->find($this->removeItem)->click();
         $element = $this->browser->find($this->confirmModal);
         /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
@@ -70,6 +71,23 @@ public function removeItemFromMiniCart()
         $modal->waitModalWindowToDisappear();
     }
 
+    /**
+     * Wait for Delete button is visible in the block.
+     *
+     * @return bool|null
+     */
+    private function waitForDeleteButtonVisible()
+    {
+        $rootElement = $this->_rootElement;
+        $deleteButtonSelector = $this->removeItem;
+        return $rootElement->waitUntil(
+            function () use ($rootElement, $deleteButtonSelector) {
+                $element = $rootElement->find($deleteButtonSelector);
+                return $element->isVisible() ? true : null;
+            }
+        );
+    }
+
     /**
      * Click "Edit item" button.
      *

dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php

@@ -5,8 +5,10 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
+use Magento\Catalog\Model\Product\Attribute\Repository;
+
 /**
- * Class FullTest
+ * Integration tests for \Magento\Catalog\Model\Indexer\Product\Flat\Processor.
  */
 class ProcessorTest extends \Magento\TestFramework\Indexer\TestCase
 {
@@ -64,22 +66,23 @@ public function testSaveAttribute()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoAppArea adminhtml
-     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */
     public function testDeleteAttribute()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-
-        /** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
-        $productResource = $product->getResource();
-        $productResource->getAttribute('media_gallery')->delete();
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
+        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+        /** @var Repository $productAttributeRepository */
+        $productAttributeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(Repository::class);
+        $productAttrubute = $productAttributeRepository->get('flat_attribute');
+        $productAttributeId = $productAttrubute->getAttributeId();
+        $model->load($productAttributeId)->delete();
 
         $this->assertTrue($this->_processor->getIndexer()->isInvalid());
     }

dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php

@@ -20,6 +20,7 @@
         'is_global' => 1,
         'frontend_input' => 'select',
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'option' => ['value' => ['option_0' => [0 => 'Option Label']]],
         'backend_type' => 'int',
     ]