Merge branch '2.2-develop' of github.com:magento/magento2ce into Perf_PR

Author: slopukhov

app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php

@@ -77,6 +77,7 @@ class StockItemRepository implements StockItemRepositoryInterface
 
     /**
      * @var Processor
+     * @deprecated
      */
     protected $indexProcessor;
 
@@ -181,8 +182,6 @@ public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stoc
             $stockItem->setStockId($stockItem->getStockId());
 
             $this->resource->save($stockItem);
-
-            $this->indexProcessor->reindexRow($stockItem->getProductId());
         } catch (\Exception $exception) {
             throw new CouldNotSaveException(__('Unable to save Stock Item'), $exception);
         }

app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php

@@ -304,7 +304,6 @@ public function testSave()
             ->method('save')
             ->with($this->stockItemMock)
             ->willReturnSelf();
-        $this->indexProcessorMock->expects($this->once())->method('reindexRow')->with($productId);
 
         $this->assertEquals($this->stockItemMock, $this->model->save($this->stockItemMock));
     }

dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ExportAdvancedPricingTest.xml

@@ -48,8 +48,7 @@
             </data>
             <constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertExportAdvancedPricing"/>
         </variation>
-        <variation name="ExportAdvancedPricingTestVariation4" summary="Trying export product data for product available on main website with default currency and custom website with different currency" ticketId="MAGETWO-48298">
-            <data name="issue" xsi:type="string">MAGETWO-65703: Fatal error on creation simple product with tier price in custom website via webapi handler</data>
+        <variation name="ExportAdvancedPricingTestVariation4" summary="Trying export product data for product available on main website with default currency and custom website with different currency" ticketId="MAGETWO-46153">
             <data name="configData" xsi:type="string">price_scope_website</data>
             <data name="exportData" xsi:type="string">csv_with_advanced_pricing</data>
             <data name="products/0" xsi:type="array">

dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Webapi.php

@@ -288,7 +288,11 @@ protected function prepareTierPrice()
                 $priceInfo['qty'] = $priceInfo['price_qty'];
                 unset($priceInfo['price_qty']);
 
-                unset($priceInfo['website_id']);
+                if (isset($priceInfo['website_id'])) {
+                    $priceInfo['extension_attributes']['website_id'] = $priceInfo['website_id'];
+                    unset($priceInfo['website_id']);
+                }
+
                 unset($priceInfo['delete']);
 
                 $this->fields['product']['tier_prices'][$key] = $priceInfo;

dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml

@@ -55,7 +55,7 @@
                         <item name="price" xsi:type="string">20</item>
                         <item name="price_type" xsi:type="string">Percent</item>
                         <item name="sku" xsi:type="string">sku_drop_down_row_2</item>
-                        <item name="sort_order" xsi:type="string">0</item>
+                        <item name="sort_order" xsi:type="string">1</item>
                     </item>
                 </item>
             </field>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.xml

@@ -115,8 +115,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
         </variation>
-        <variation name="CreateSimpleProductEntityTestVariation18">
-            <data name="issue" xsi:type="string">MAGETWO-60470: [Import Custom options] An error occurs on attempt to save the product with imported options</data>
+        <variation name="CreateSimpleProductEntityTestVariation18" summary="Create simple product with imported options" ticketId="MAGETWO-71386">
             <data name="description" xsi:type="string">Create product wit suite of custom options</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
@@ -129,7 +128,6 @@
             <data name="product/data/custom_options/dataset" xsi:type="string">options_suite</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">simple_options_suite</data>
             <data name="product/data/custom_options/import_products" xsi:type="string">catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option</data>
-            <data name="issue" xsi:type="string">MAGETWO-58181: All kind of Custom Options have dynamic view on Bamboo</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog/Edit/PromoForm.php

@@ -6,15 +6,24 @@
 
 namespace Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit;
 
-use \Magento\Ui\Test\Block\Adminhtml\FormSections;
-use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Backend\Test\Block\Template;
+use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Mtf\Client\Element\SimpleElement;
+use Magento\Ui\Test\Block\Adminhtml\FormSections;
 
 /**
  * Form for creation of a Catalog Price Rule.
  */
 class PromoForm extends FormSections
 {
+    /**
+     * Selector for template block.
+     *
+     * @var string
+     */
+    private $templateBlockSelector = './ancestor::body';
+
     /**
      * Fill form with tabs.
      *
@@ -25,6 +34,7 @@ class PromoForm extends FormSections
      */
     public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
     {
+        $this->waitPageToLoad();
         $sections = $this->getFixtureFieldsByContainers($fixture);
         if ($replace) {
             $sections = $this->prepareData($sections, $replace);
@@ -55,4 +65,28 @@ protected function prepareData(array $tabs, array $replace)
 
         return $tabs;
     }
+
+    /**
+     * Wait page to load.
+     *
+     * @return void
+     */
+    protected function waitPageToLoad()
+    {
+        $this->waitForElementVisible($this->header);
+        $this->getTemplateBlock()->waitLoader();
+    }
+
+    /**
+     * Get template block.
+     *
+     * @return Template
+     */
+    private function getTemplateBlock()
+    {
+        return $this->blockFactory->create(
+            Template::class,
+            ['element' => $this->_rootElement->find($this->templateBlockSelector, Locator::SELECTOR_XPATH)]
+        );
+    }
 }