Merge branch '5.x' into feature/variant-mgmt-improvements

Author: lukeholder

tests/fixtures/data/stores.php

@@ -3,7 +3,7 @@
 return [
     'primary' => [
         '_load' => false,
-        '_sites' => [1000],
+        '_sites' => [1, 1000],
         'settings' => [
             '_storeLocationAddress' => [
                 'countryCode' => 'US',

tests/unit/elements/variant/VariantQueryTest.php

@@ -242,7 +242,7 @@ public function queryingBySiteDataProvider(): array
     {
         return [
             'one-site' => [['testSite1'], 3, ['testSite1' => 'primary']],
-            'two-sites-same-store' => [['testSite1', 'default'], 6, ['testSite1' => 'primary', 'default' => 'primary']],
+            'two-sites-same-store' => [['testSite1', 'defaultSite'], 6, ['testSite1' => 'primary', 'defaultSite' => 'primary']],
             'two-sites-different-stores' => [['testSite1', 'testSite2'], 6, ['testSite1' => 'primary', 'testSite2' => 'euStore']],
         ];
     }

tests/unit/services/CatalogPricingTest.php

@@ -79,13 +79,15 @@ public function testGeneratePricesNoRules(): void
         self::assertCount(10, (new Query())->select('id')->from(Table::CATALOG_PRICING)->all());
 
         $checkVariantPrices = function(Product $product) {
-            $product->getVariants()->each(function(Variant $variant) use ($product) {
-                self::assertEquals($variant->basePrice, (new Query())
+            $storeId = $product->getStore()->id;
+            $product->getVariants()->each(function(Variant $variant) use ($storeId) {
+                $price = (new Query())
                     ->select('price')
                     ->from(Table::CATALOG_PRICING)
                     ->where(['purchasableId' => $variant->id])
-                    ->andWhere(['storeId' => $product->storeId])
-                    ->scalar(),
+                    ->andWhere(['storeId' => $storeId])
+                    ->scalar();
+                self::assertEquals($variant->basePrice, $price,
                     $variant->title . ' price has been generated correctly'
                 );
             });