Github #99: Sync "develop-storefront" with master branches

le0n4ik · le0n4ik · commit a4850f2f56a6 · 2020-08-03T16:19:12.000-05:00
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php
@@ -20,7 +20,7 @@
 /**
  * Check configurable product price displaying
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
  * @magentoAppArea frontend
  */
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
@@ -36,6 +36,7 @@
 $attributeValues = [];
 $attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
 $associatedProductIds = [];
+$productIds = [10, 20];
 array_shift($options); //remove the first option which is empty
 
 foreach ($options as $option) {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/WishlistTest.php
@@ -18,7 +18,7 @@
  * Tests for customer wish list tab.
  *
  * @magentoAppArea adminhtml
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  */
 class WishlistTest extends TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
@@ -16,7 +16,7 @@
 /**
  * Load customer data test class.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  */
 class LoadTest extends AbstractController
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -249,6 +249,7 @@ public function testGetCustomerWishlistNoCustomerId()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testGetCustomerWishlist()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/Wishlist/Item/ColumnTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/Wishlist/Item/ColumnTest.php
@@ -21,7 +21,7 @@
 /**
  * Test wish list item column.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php
@@ -18,7 +18,7 @@
  * Class test block wish list on customer account page.
  *
  * @magentoAppArea frontend
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation disabled
  */
 class WishlistTest extends TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/IndexTest.php
@@ -14,7 +14,7 @@
 /**
  * Test wish list on customer account page.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  */
 class IndexTest extends AbstractController
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/RemoveTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/RemoveTest.php
@@ -16,7 +16,7 @@
 /**
  * Test for remove product from wish list.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/SendTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/SendTest.php
@@ -19,7 +19,7 @@
 /**
  * Test sending wish list.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateTest.php
@@ -16,7 +16,7 @@
 /**
  * Test for update wish list item.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/SharedTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/SharedTest.php
@@ -10,6 +10,7 @@ class SharedTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
      * @magentoDataFixture Magento/Wishlist/_files/wishlist_shared.php
+     * @magentoDbIsolation disabled
      * @return void
      */
     public function testAllcartAction()
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php
@@ -46,7 +46,7 @@ protected function setUp(): void
      *
      * @magentoDataFixture Magento/Wishlist/_files/wishlist_shared.php
      * @magentoAppIsolation enabled
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testLoadedProductAttributes()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -20,7 +20,7 @@
 /**
  * Tests for wish list model.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation disabled
  */
 class WishlistTest extends TestCase

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`/**`
`21`	`21`	`* Check configurable product price displaying`
`22`	`22`	`*`
`23`		`- * @magentoDbIsolation enabled`
	`23`	`+ * @magentoDbIsolation disabled`
`24`	`24`	`* @magentoAppIsolation enabled`
`25`	`25`	`* @magentoAppArea frontend`
`26`	`26`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* Tests for customer wish list tab.`
`19`	`19`	`*`
`20`	`20`	`* @magentoAppArea adminhtml`
`21`		`- * @magentoDbIsolation enabled`
	`21`	`+ * @magentoDbIsolation disabled`
`22`	`22`	`*/`
`23`	`23`	`class WishlistTest extends TestCase`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* Load customer data test class.`
`18`	`18`	`*`
`19`		`- * @magentoDbIsolation enabled`
	`19`	`+ * @magentoDbIsolation disabled`
`20`	`20`	`* @magentoAppArea frontend`
`21`	`21`	`*/`
`22`	`22`	`class LoadTest extends AbstractController`
Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,7 @@ public function testGetCustomerWishlistNoCustomerId()`
`249`	`249`	`* @magentoDataFixture Magento/Customer/_files/customer.php`
`250`	`250`	`* @magentoDataFixture Magento/Catalog/_files/product_simple.php`
`251`	`251`	`* @magentoAppIsolation enabled`
	`252`	`+ * @magentoDbIsolation disabled`
`252`	`253`	`*/`
`253`	`254`	`public function testGetCustomerWishlist()`
`254`	`255`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`/**`
`22`	`22`	`* Test wish list item column.`
`23`	`23`	`*`
`24`		`- * @magentoDbIsolation enabled`
	`24`	`+ * @magentoDbIsolation disabled`
`25`	`25`	`* @magentoAppArea frontend`
`26`	`26`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`27`	`27`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/**`
`15`	`15`	`* Test wish list on customer account page.`
`16`	`16`	`*`
`17`		`- * @magentoDbIsolation enabled`
	`17`	`+ * @magentoDbIsolation disabled`
`18`	`18`	`* @magentoAppArea frontend`
`19`	`19`	`*/`
`20`	`20`	`class IndexTest extends AbstractController`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`/**`
`20`	`20`	`* Test sending wish list.`
`21`	`21`	`*`
`22`		`- * @magentoDbIsolation enabled`
	`22`	`+ * @magentoDbIsolation disabled`
`23`	`23`	`* @magentoAppArea frontend`
`24`	`24`	`* @magentoDataFixture Magento/Wishlist/_files/wishlist.php`
`25`	`25`	`*/`