MC-18527: Merge release branch into 2.3-develop

krissyhiserote · krissyhiserote · commit 41a2e82eb2c4 · 2019-10-09T19:07:23.000-05:00
- fix MFTF and integration tests
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
@@ -20,12 +20,16 @@
             <group value="catalog"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create product-->
             <comment userInput="Create product" stepKey="commentCreateProduct"/>
             <createData entity="VirtualProduct" stepKey="createProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <!--Delete product-->
             <comment userInput="Delete product" stepKey="commentDeleteProduct"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
@@ -19,6 +19,9 @@
             <group value="configurable_product"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create sample data:
                  1. Create simple products -->
             <createData entity="ApiCategory" stepKey="createCategory"/>
@@ -128,6 +131,9 @@
             <actionGroup ref="deleteAllExportedFiles" stepKey="clearExportedFilesList"/>
     </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete created data -->
             <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFisrtSimpleProduct"/>
             <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest.xml
@@ -37,12 +37,16 @@
             <group value="catalog"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <!--Create product-->
             <comment userInput="Create product" stepKey="commentCreateProduct"/>
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <!--Delete product-->
             <comment userInput="Delete product" stepKey="commentDeleteProduct"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
@@ -18,6 +18,9 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -61,6 +64,9 @@
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
@@ -18,6 +18,9 @@
             <group value="Downloadable"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
@@ -61,6 +64,9 @@
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyDisableDownloadableProductSamplesAreNotAccessibleTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyDisableDownloadableProductSamplesAreNotAccessibleTest.xml
@@ -21,6 +21,9 @@
             <group value="catalog"/>
         </annotations>
         <before>
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
             <!-- Create category -->
             <createData entity="_defaultCategory" stepKey="createCategory"/>
 
@@ -40,6 +43,9 @@
             </createData>
         </before>
         <after>
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
             <!-- Delete product -->
             <deleteData createDataKey="createProduct" stepKey="deleteDownloadableProduct"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenAndFillCreditMemoRefundActionGroup.xml
@@ -35,7 +35,6 @@
         <fillField userInput="{{adjustmentRefund}}" selector="{{AdminCreditMemoTotalSection.adjustmentRefund}}" stepKey="fillAdjustmentRefund"/>
         <fillField userInput="{{adjustmentFee}}" selector="{{AdminCreditMemoTotalSection.adjustmentFee}}" stepKey="fillAdjustmentFee"/>
         <checkOption selector="{{AdminCreditMemoTotalSection.emailCopy}}" stepKey="checkSendEmailCopy"/>
-        <conditionalClick selector="{{AdminCreditMemoTotalSection.updateTotals}}" dependentSelector="{{AdminCreditMemoTotalSection.disabledUpdateTotals}}" visible="false" stepKey="clickUpdateTotalsButton"/>
     </actionGroup>
     
     <!-- Open and fill CreditMemo refund with back to stock -->
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quotes.php
@@ -19,11 +19,6 @@
 /** @var QuoteRepository $quoteRepository */
 $quoteRepository = $objectManager->get(QuoteRepository::class);
 
-/** @var Magento\Store\Model\Store $store */
-$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-$store->load('fixture_second_store');
-$storeId = $store->getId();
-
 $quotes = [
     'quote for first store' => [
         'store' => 1,
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
@@ -8,7 +8,8 @@
 
 /** @var \Magento\Store\Model\Store $store */
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
-if (!$store->load('fixture_second_store', 'code')->getId()) {
+$storeId = $store->load('fixture_second_store', 'code')->getId();
+if (!$storeId) {
     $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
         \Magento\Store\Model\StoreManagerInterface::class
     )->getWebsite()
@@ -30,4 +31,6 @@
         1
     );
     $store->save();
+
+    $storeId = $store->getId();
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`
`9`	`9`	`/** @var \Magento\Store\Model\Store $store */`
`10`	`10`	`$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);`
`11`		`-if (!$store->load('fixture_second_store', 'code')->getId()) {`
	`11`	`+$storeId = $store->load('fixture_second_store', 'code')->getId();`
	`12`	`+if (!$storeId) {`
`12`	`13`	`$websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(`
`13`	`14`	`\Magento\Store\Model\StoreManagerInterface::class`
`14`	`15`	`)->getWebsite()`
`@@ -30,4 +31,6 @@`
`30`	`31`	`1`
`31`	`32`	`);`
`32`	`33`	`$store->save();`
	`34`	`+`
	`35`	`+ $storeId = $store->getId();`
`33`	`36`	`}`