Merge remote-tracking branch 'origin/MAGETWO-86048' into 2.2-develop-pr59

Author: zakdma

app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php

@@ -199,7 +199,10 @@ protected function _prepareForm()
                 'label' => __('Select File to Import'),
                 'title' => __('Select File to Import'),
                 'required' => true,
-                'class' => 'input-file'
+                'class' => 'input-file',
+                'note' => __(
+                    'File must be saved in UTF-8 encoding for proper import'
+                ),
             ]
         );
         $fieldsets['upload']->addField(

dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php

@@ -6,6 +6,7 @@
 
 namespace Magento\CatalogRule\Test\Constraint;
 
+use Magento\Checkout\Test\Constraint\Utils\CartPageLoadTrait;
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -16,6 +17,8 @@
  */
 class AssertCatalogPriceRuleAppliedShoppingCart extends AbstractConstraint
 {
+    use CartPageLoadTrait;
+
     /**
      * Assert that Catalog Price Rule is applied for product(s) in Shopping Cart
      * according to Priority(Priority/Stop Further Rules Processing).
@@ -48,6 +51,7 @@ public function processAssert(
             ['products' => $products]
         )->run();
         $checkoutCartPage->open();
+        $this->waitForCartPageLoaded($checkoutCartPage);
         foreach ($products as $key => $product) {
             $actualPrice = $checkoutCartPage->getCartBlock()->getCartItem($product)->getSubtotalPrice();
             \PHPUnit_Framework_Assert::assertEquals(

dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php

@@ -38,6 +38,7 @@ class PromoQuoteForm extends FormSections
      */
     public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
     {
+        $this->waitForElementNotVisible($this->waitForSelector);
         $sections = $this->getFixtureFieldsByContainers($fixture);
         if ($replace) {
             $sections = $this->prepareData($sections, $replace);

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php

@@ -70,7 +70,7 @@
 )->setPrice(
     10
 )->addData(
-    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/']
+    ['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª']
 )->setTierPrice(
     [0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]]
 )->setVisibility(

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php

@@ -23,7 +23,7 @@
     ->setName('New Product')
     ->setSku('simple "1"')
     ->setPrice(10)
-    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/'])
+    ->addData(['text_attribute' => '!@#$%^&*()_+1234567890-=|\\:;"\'<,>.?/›ƒª'])
     ->setTierPrice([0 => ['website_id' => 0, 'cust_group' => 0, 'price_qty' => 3, 'price' => 8]])
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)