MTA-4123: Check skipped CreateTaxRule and CreateSimpleProductEntityWithSeveralWebsites tests on Jenkins

- merge commit

Author: SmolyarO

.gitignore

@@ -25,6 +25,8 @@ atlassian*
 /.grunt
 /Gruntfile.js
 /package.json
+/grunt-config.json
+/dev/tools/grunt/configs/local-themes.js
 
 /pub/media/*.*
 !/pub/media/.htaccess

app/code/Magento/Backend/i18n/en_US.csv

@@ -250,7 +250,7 @@ Minute,Minute
 "JavaScript may be disabled in your browser.","JavaScript may be disabled in your browser."
 "To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
 "This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
-"Report a Bug","Report a Bug"
+"Report an Issue","Report an Issue"
 "Store View:","Store View:"
 "Stores Configuration","Stores Configuration"
 "Please confirm scope switching. All data that hasn\'t been saved will be lost.","Please confirm scope switching. All data that hasn\'t been saved will be lost."

app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml

@@ -8,5 +8,5 @@
 
 ?>
 <?php if ($block->getBugreportUrl()): ?>
-    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report a Bug') ?></a>
+    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report an Issue') ?></a>
 <?php endif; ?>

app/code/Magento/Catalog/view/base/web/images/product/placeholder/swatch_image.jpg

@@ -53,7 +53,7 @@ public function __construct(
     public function apply(\Magento\Framework\App\RequestInterface $request)
     {
         $attributeValue = $request->getParam($this->_requestVar);
-        if (empty($attributeValue)) {
+        if (empty($attributeValue) && !is_numeric($attributeValue)) {
             return $this;
         }
         $attribute = $this->getAttributeModel();
@@ -84,9 +84,10 @@ protected function _getItemsData()
             ->getProductCollection();
         $optionsFacetedData = $productCollection->getFacetedData($attribute->getAttributeCode());
 
-        if (count($optionsFacetedData) === 0
-            && $this->getAttributeIsFilterable($attribute) !== static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
-        ) {
+        $isAttributeFilterable =
+            $this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS;
+
+        if (count($optionsFacetedData) === 0 && !$isAttributeFilterable) {
             return $this->itemDataBuilder->build();
         }
 
@@ -95,28 +96,64 @@ protected function _getItemsData()
         $options = $attribute->getFrontend()
             ->getSelectOptions();
         foreach ($options as $option) {
-            if (empty($option['value'])) {
-                continue;
-            }
+            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize);
+        }
 
-            $value = $option['value'];
+        return $this->itemDataBuilder->build();
+    }
 
-            $count = isset($optionsFacetedData[$value]['count'])
-                ? (int)$optionsFacetedData[$value]['count']
-                : 0;
-            // Check filter type
-            if ($this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
-                && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)
-            ) {
-                continue;
-            }
-            $this->itemDataBuilder->addItemData(
-                $this->tagFilter->filter($option['label']),
-                $value,
-                $count
-            );
+    /**
+     * Build option data
+     *
+     * @param array $option
+     * @param boolean $isAttributeFilterable
+     * @param array $optionsFacetedData
+     * @param int $productSize
+     * @return void
+     */
+    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize)
+    {
+        $value = $this->getOptionValue($option);
+        if ($value === false) {
+            return;
+        }
+        $count = $this->getOptionCount($value, $optionsFacetedData);
+        if ($isAttributeFilterable && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)) {
+            return;
         }
 
-        return $this->itemDataBuilder->build();
+        $this->itemDataBuilder->addItemData(
+            $this->tagFilter->filter($option['label']),
+            $value,
+            $count
+        );
+    }
+
+    /**
+     * Retrieve option value if it exists
+     *
+     * @param array $option
+     * @return bool|string
+     */
+    private function getOptionValue($option)
+    {
+        if (empty($option['value']) && !is_numeric($option['value'])) {
+            return false;
+        }
+        return $option['value'];
+    }
+
+    /**
+     * Retrieve count of the options
+     *
+     * @param int|string $value
+     * @param array $optionsFacetedData
+     * @return int
+     */
+    private function getOptionCount($value, $optionsFacetedData)
+    {
+        return isset($optionsFacetedData[$value]['count'])
+            ? (int)$optionsFacetedData[$value]['count']
+            : 0;
     }
 }

app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php

@@ -40,6 +40,7 @@ function setPostcodeOptional(zipElement, country) {
             zipElement.removeClassName('required-entry');
         }
         zipElement.up('div.field').removeClassName('required');
+        zipElement.up('div.field').removeClassName('_required');
     } else {
         zipElement.addClassName('required-entry');
         zipElement.up('div.field').addClassName('required');

app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml

@@ -325,6 +325,7 @@ public function clear()
         $this->items = [];
         $this->errorStatistics = [];
         $this->invalidRows = [];
+        $this->skippedRows = [];
 
         return $this;
     }

app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php

@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Framework\Module\ModuleListInterface" type="Magento\Framework\Module\ModuleList" />
     <type name="Magento\NewRelicReporting\Model\Module\Collect">
         <arguments>
             <argument name="fullModuleList" xsi:type="object">Magento\Framework\Module\FullModuleList</argument>

app/code/Magento/NewRelicReporting/etc/di.xml

@@ -21,7 +21,7 @@ interface GuestCartItemRepositoryInterface
     public function getList($cartId);
 
     /**
-     * Add the specified item to the specified cart.
+     * Add/update the specified cart item. 
      *
      * @param \Magento\Quote\Api\Data\CartItemInterface $cartItem The item.
      * @return \Magento\Quote\Api\Data\CartItemInterface Item.

app/code/Magento/Quote/Api/GuestCartItemRepositoryInterface.php

@@ -1626,10 +1626,11 @@ public function addProduct(
 
             // collect errors instead of throwing first one
             if ($item->getHasError()) {
-                $message = $item->getMessage();
-                if (!in_array($message, $errors)) {
-                    // filter duplicate messages
-                    $errors[] = $message;
+                foreach ($item->getMessage(false) as $message) {
+                    if (!in_array($message, $errors)) {
+                        // filter duplicate messages
+                        $errors[] = $message;
+                    }
                 }
             }
         }