Merge remote-tracking branch 'origin/MAGETWO-89238-2.2' into PANDA-PR-2.2

Author: le0n4eg

dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php

@@ -85,4 +85,19 @@ public function testInvoiceEmailSenderExecute()
 
         $this->assertCount($expectedResult, $sendCollection->getItems());
     }
+
+    /**
+     * @inheritdoc
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Exception
+     */
+    protected function tearDown()
+    {
+        /** @var \Magento\Config\Model\Config $defConfig */
+        $defConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Config\Model\Config::class);
+        $defConfig->setScope(\Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+        $defConfig->setDataByPath('sales_email/general/async_sending', 0);
+        $defConfig->save();
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/_files/invoice_list_different_stores_rollback.php

@@ -6,10 +6,4 @@
 declare(strict_types=1);
 
 require 'default_rollback.php';
-
-/** @var \Magento\Config\Model\Config $defConfig */
-$defConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Config\Model\Config::class);
-$defConfig->setScope(\Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-$defConfig->setDataByPath('sales_email/general/async_sending', 0);
-$defConfig->save();
+require __DIR__ . '/../../../Magento/Store/_files/second_store_rollback.php';