Merge remote-tracking branch 'origin/MAGETWO-90294' into 2.3-develop-pr18

Author: ameysar

.travis.yml

@@ -22,7 +22,7 @@ env:
   global:
     - COMPOSER_BIN_DIR=~/bin
     - INTEGRATION_SETS=3
-    - NODE_JS_VERSION=6
+    - NODE_JS_VERSION=8
     - MAGENTO_HOST_NAME="magento2.travis"
   matrix:
     - TEST_SUITE=unit

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

@@ -176,4 +176,5 @@ Rate,Rate
 "Order Total Incl. Tax","Order Total Incl. Tax"
 "Order Total","Order Total"
 "Your credit card will be charged for","Your credit card will be charged for"
-"An error occurred while loading tax rates.","An error occurred while loading tax rates."
+"An error occurred while loading tax rates.","An error occurred while loading tax rates."
+"You will be charged for","You will be charged for"

app/code/Magento/Tax/view/frontend/layout/checkout_index_index.xml

@@ -70,7 +70,7 @@
                                                             <item name="config" xsi:type="array">
                                                                 <item name="exclTaxLabel" xsi:type="string" translate="true">Order Total Excl. Tax</item>
                                                                 <item name="inclTaxLabel" xsi:type="string" translate="true">Order Total Incl. Tax</item>
-                                                                <item name="basicCurrencyMessage" xsi:type="string" translate="true">Your credit card will be charged for</item>
+                                                                <item name="basicCurrencyMessage" xsi:type="string" translate="true">You will be charged for</item>
                                                                 <item name="title" xsi:type="string" translate="true">Order Total</item>
                                                             </item>
                                                         </item>

dev/tests/integration/testsuite/Magento/Setup/Model/FixtureGenerator/ProductGeneratorTest.php

@@ -9,11 +9,13 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Indexer\Model\Config;
+use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * @magentoAppArea adminhtml
  * @magentoDataFixture Magento/Catalog/_files/category.php
+ * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
  */
 class ProductGeneratorTest extends \PHPUnit\Framework\TestCase
 {
@@ -37,6 +39,11 @@ class ProductGeneratorTest extends \PHPUnit\Framework\TestCase
      */
     private $indexersState = [];
 
+    /**
+     * @var WebsiteRepository
+     */
+    private $websiteRepository;
+
     /**
      * @return void
      */
@@ -45,7 +52,7 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productGenerator = $this->objectManager->get(ProductGenerator::class);
-
+        $this->websiteRepository = $this->objectManager->get(WebsiteRepository::class);
         $indexerRegistry = $this->objectManager->get(IndexerRegistry::class);
         $indexerListIds = $this->objectManager->get(Config::class)->getIndexers();
 
@@ -79,6 +86,7 @@ public function testProductGeneration()
         $price = 7.99;
         $url = 'simple-product-url';
         $categoryId = 333;
+        $secondWebsiteId = $this->websiteRepository->get('test')->getId();
 
         $fixtureMap = [
             'name' => function () use ($name) {
@@ -96,6 +104,9 @@ public function testProductGeneration()
             'category_ids' => function () use ($categoryId) {
                 return $categoryId;
             },
+            'website_ids' => function () use ($secondWebsiteId) {
+                return [1, $secondWebsiteId];
+            }
         ];
         $this->productGenerator->generate(1, $fixtureMap);
 

setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php

@@ -171,7 +171,7 @@ public function generate($products, $fixtureMap)
             ],
         ];
         $websiteIdsFixtures = $fixtureMap['website_ids'](1, 0);
-        if ((is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) || $websiteIdsFixtures != null) {
+        if (is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) {
             // Get website id from fixture in case when one site is assigned per product
             $customTableMap['catalog_product_website'] = [
                 'fields' => [