MAGETWO-84929: Default merchant account ID is used on subsequent partial invoices

YevSent · YevSent · commit 8e11bcedddb9 · 2018-07-27T14:11:33.000+03:00
- Added application isolation level for tests
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\CacheCleaner;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class CustomerMetadataTest extends \PHPUnit\Framework\TestCase
 {
     /** @var CustomerRepositoryInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
@@ -13,6 +13,7 @@
 
 /**
  * Test for \Magento\Customer\Model\CustomerRegistry
+ * @magentoAppIsolation enabled
  */
 class CustomerRegistryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupRegistryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupRegistryTest.php
@@ -8,6 +8,7 @@
 
 /**
  * Test for \Magento\Customer\Model\GroupRegistry
+ * @magentoAppIsolation enabled
  */
 class GroupRegistryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
@@ -20,6 +20,7 @@
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppIsolation enabled
  */
 class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/CustomerRepositoryTest.php
@@ -15,6 +15,7 @@
  * Checks Customer insert, update, search with repository
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppIsolation enabled
  */
 class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/Grid/CollectionTest.php
@@ -12,6 +12,7 @@
 
 /**
  * Customer grid collection tests.
+ * @magentoAppIsolation enabled
  */
 class CollectionTest extends \Magento\TestFramework\Indexer\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/GroupRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/GroupRepositoryTest.php
@@ -11,6 +11,7 @@
 
 /**
  * Integration test for \Magento\Customer\Model\ResourceModel\GroupRepository
+ * @magentoAppIsolation enabled
  */
 class GroupRepositoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/VisitorTest.php
@@ -7,6 +7,9 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class VisitorTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Eav/Model/Validator/Attribute/BackendTest.php b/dev/tests/integration/testsuite/Magento/Eav/Model/Validator/Attribute/BackendTest.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Eav\Model\Validator\Attribute;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class BackendTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/JoinProcessorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/ExtensionAttribute/JoinProcessorTest.php
@@ -17,6 +17,7 @@
  * Class to test the JoinProcessor functionality
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @magentoAppIsolation enabled
  */
 class JoinProcessorTest extends \PHPUnit\Framework\TestCase
 {
@@ -144,55 +145,55 @@ public function testProcess()
     private function getConfig()
     {
         return [\Magento\Catalog\Api\Data\ProductInterface::class => [
-                'review_id' => [
-                    Converter::DATA_TYPE => 'string',
-                    Converter::RESOURCE_PERMISSIONS => [],
-                    Converter::JOIN_DIRECTIVE => [
-                        Converter::JOIN_REFERENCE_TABLE => "reviews",
-                        Converter::JOIN_REFERENCE_FIELD => "product_id",
-                        Converter::JOIN_FIELDS => [
-                            [
-                                Converter::JOIN_FIELD => "review_id",
-                                Converter::JOIN_FIELD_COLUMN => "db_review_id",
-                            ],
+            'review_id' => [
+                Converter::DATA_TYPE => 'string',
+                Converter::RESOURCE_PERMISSIONS => [],
+                Converter::JOIN_DIRECTIVE => [
+                    Converter::JOIN_REFERENCE_TABLE => "reviews",
+                    Converter::JOIN_REFERENCE_FIELD => "product_id",
+                    Converter::JOIN_FIELDS => [
+                        [
+                            Converter::JOIN_FIELD => "review_id",
+                            Converter::JOIN_FIELD_COLUMN => "db_review_id",
                         ],
-                        Converter::JOIN_ON_FIELD => "id",
                     ],
+                    Converter::JOIN_ON_FIELD => "id",
                 ],
-            ], \Magento\Customer\Api\Data\CustomerInterface::class => [
-                'library_card_id' => [
-                    Converter::DATA_TYPE => 'string',
-                    Converter::RESOURCE_PERMISSIONS => [],
-                    Converter::JOIN_DIRECTIVE => [
-                        Converter::JOIN_REFERENCE_TABLE => "library_account",
-                        Converter::JOIN_FIELDS => [
-                            [
-                                Converter::JOIN_FIELD => "library_card_id",
-                                Converter::JOIN_FIELD_COLUMN => "",
-                            ],
+            ],
+        ], \Magento\Customer\Api\Data\CustomerInterface::class => [
+            'library_card_id' => [
+                Converter::DATA_TYPE => 'string',
+                Converter::RESOURCE_PERMISSIONS => [],
+                Converter::JOIN_DIRECTIVE => [
+                    Converter::JOIN_REFERENCE_TABLE => "library_account",
+                    Converter::JOIN_FIELDS => [
+                        [
+                            Converter::JOIN_FIELD => "library_card_id",
+                            Converter::JOIN_FIELD_COLUMN => "",
                         ],
-                        Converter::JOIN_ON_FIELD => "customer_id",
                     ],
+                    Converter::JOIN_ON_FIELD => "customer_id",
                 ],
-                'reviews' => [
-                    Converter::DATA_TYPE => 'Magento\Reviews\Api\Data\Reviews[]',
-                    Converter::RESOURCE_PERMISSIONS => [],
-                    Converter::JOIN_DIRECTIVE => [
-                        Converter::JOIN_REFERENCE_TABLE => "reviews",
-                        Converter::JOIN_FIELDS => [
-                            [
-                                Converter::JOIN_FIELD => "comment",
-                                Converter::JOIN_FIELD_COLUMN => "",
-                            ],
-                            [
-                                Converter::JOIN_FIELD => "rating",
-                                Converter::JOIN_FIELD_COLUMN => "",
-                            ],
+            ],
+            'reviews' => [
+                Converter::DATA_TYPE => 'Magento\Reviews\Api\Data\Reviews[]',
+                Converter::RESOURCE_PERMISSIONS => [],
+                Converter::JOIN_DIRECTIVE => [
+                    Converter::JOIN_REFERENCE_TABLE => "reviews",
+                    Converter::JOIN_FIELDS => [
+                        [
+                            Converter::JOIN_FIELD => "comment",
+                            Converter::JOIN_FIELD_COLUMN => "",
+                        ],
+                        [
+                            Converter::JOIN_FIELD => "rating",
+                            Converter::JOIN_FIELD_COLUMN => "",
                         ],
-                        Converter::JOIN_ON_FIELD => "customer_id",
                     ],
+                    Converter::JOIN_ON_FIELD => "customer_id",
                 ],
             ],
+        ],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`use Magento\Framework\Exception\NoSuchEntityException;`
`12`	`12`	`use Magento\TestFramework\Helper\CacheCleaner;`
`13`	`13`
	`14`	`+/**`
	`15`	`+ * @magentoAppIsolation enabled`
	`16`	`+ */`
`14`	`17`	`class CustomerMetadataTest extends \PHPUnit\Framework\TestCase`
`15`	`18`	`{`
`16`	`19`	`/** @var CustomerRepositoryInterface */`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Test for \Magento\Customer\Model\CustomerRegistry`
	`16`	`+ * @magentoAppIsolation enabled`
`16`	`17`	`*/`
`17`	`18`	`class CustomerRegistryTest extends \PHPUnit\Framework\TestCase`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`/**`
`10`	`10`	`* Test for \Magento\Customer\Model\GroupRegistry`
	`11`	`+ * @magentoAppIsolation enabled`
`11`	`12`	`*/`
`12`	`13`	`class GroupRegistryTest extends \PHPUnit\Framework\TestCase`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`* @SuppressWarnings(PHPMD.TooManyMethods)`
`21`	`21`	`* @SuppressWarnings(PHPMD.ExcessivePublicCount)`
`22`	`22`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`23`	`+ * @magentoAppIsolation enabled`
`23`	`24`	`*/`
`24`	`25`	`class AddressRepositoryTest extends \PHPUnit\Framework\TestCase`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`* Checks Customer insert, update, search with repository`
`16`	`16`	`*`
`17`	`17`	`* @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
	`18`	`+ * @magentoAppIsolation enabled`
`18`	`19`	`*/`
`19`	`20`	`class CustomerRepositoryTest extends \PHPUnit\Framework\TestCase`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`* Customer grid collection tests.`
	`15`	`+ * @magentoAppIsolation enabled`
`15`	`16`	`*/`
`16`	`17`	`class CollectionTest extends \Magento\TestFramework\Indexer\TestCase`
`17`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* Integration test for \Magento\Customer\Model\ResourceModel\GroupRepository`
	`14`	`+ * @magentoAppIsolation enabled`
`14`	`15`	`*/`
`15`	`16`	`class GroupRepositoryTest extends \PHPUnit\Framework\TestCase`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`
`8`	`8`	`use Magento\TestFramework\Helper\Bootstrap;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @magentoAppIsolation enabled`
	`12`	`+ */`
`10`	`13`	`class VisitorTest extends \PHPUnit\Framework\TestCase`
`11`	`14`	`{`
`12`	`15`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`	`*/`
`10`	`10`	`namespace Magento\Eav\Model\Validator\Attribute;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @magentoAppIsolation enabled`
	`14`	`+ */`
`12`	`15`	`class BackendTest extends \PHPUnit\Framework\TestCase`
`13`	`16`	`{`
`14`	`17`	`/**`