MC-15776: Merge release branch into 2.3-develop

krissyhiserote · krissyhiserote · commit f69830c525fd · 2019-07-15T11:08:30.000-05:00
- fix integration tests
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -70,6 +70,9 @@ public function testGetCustomAttributesMetadata()
         );
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     */
     public function testGetNestedOptionsCustomerAttributesMetadata()
     {
         $nestedOptionsAttribute = 'store_id';

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ public function testGetCustomAttributesMetadata()`
`70`	`70`	`);`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ /**`
	`74`	`+ * @magentoAppIsolation enabled`
	`75`	`+ */`
`73`	`76`	`public function testGetNestedOptionsCustomerAttributesMetadata()`
`74`	`77`	`{`
`75`	`78`	`$nestedOptionsAttribute = 'store_id';`