MAGETWO-62783: Wrong address template used for order e-mails

Author: magicbunneh

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

@@ -4,59 +4,54 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
-require __DIR__ . '/../../../Magento/Store/_files/core_fixturestore.php';
-
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-$objectManager->get(\Magento\Framework\Indexer\IndexerRegistry::class)
-    ->get('catalogsearch_fulltext')
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Catalog\Model\Product;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Payment as OrderPayment;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\Model\Order;
+use Magento\Store\Model\StoreManagerInterface;
+
+require __DIR__ . '/../../Store/_files/core_fixturestore.php';
+
+$objectManager = BootstrapHelper::getObjectManager();
+
+$objectManager->get(IndexerRegistry::class)
+    ->get(FulltextIndexer::INDEXER_ID)
     ->reindexAll();
 
-require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_duplicated.php';
-/** @var \Magento\Catalog\Model\Product $product */
+require __DIR__ . '/../../Catalog/_files/product_simple_duplicated.php';
+/** @var Product $product */
 
 $addressData = include __DIR__ . '/address_data.php';
 
-$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
 $billingAddress->setAddressType('billing');
 
 $shippingAddress = clone $billingAddress;
 $shippingAddress->setId(null)->setAddressType('shipping');
 
-$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment = $objectManager->create(OrderPayment::class);
 $payment->setMethod('checkmo');
 
-/** @var \Magento\Sales\Model\Order\Item $orderItem */
-$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
 $orderItem->setProductId($product->getId())->setQtyOrdered(2);
 
-/** @var \Magento\Sales\Model\Order $order */
-$order = $objectManager->create(\Magento\Sales\Model\Order::class);
-$order->setIncrementId(
-    '100000004'
-)->setState(
-    \Magento\Sales\Model\Order::STATE_PROCESSING
-)->setStatus(
-    $order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING)
-)->setSubtotal(
-    100
-)->setBaseSubtotal(
-    100
-)->setCustomerIsGuest(
-    true
-)->setCustomerEmail(
-    '[email protected]'
-)->setBillingAddress(
-    $billingAddress
-)->setShippingAddress(
-    $shippingAddress
-)->setStoreId(
-    $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore('fixturestore')->getId()
-)->addItem(
-    $orderItem
-)->setPayment(
-    $payment
-);
-$order->save();
+/** @var Order $order */
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000004')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
+    ->setSubtotal(100)
+    ->setBaseSubtotal(100)
+    ->setCustomerIsGuest(true)
+    ->setCustomerEmail('[email protected]')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore('fixturestore')->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment)
+    ->save();

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

@@ -6,11 +6,12 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 
 require __DIR__ . '/default_rollback.php';
 require __DIR__ . '/../../Catalog/_files/product_simple_duplicated_rollback.php';
 require __DIR__ . '/../../Store/_files/core_fixturestore_rollback.php';
 
 Bootstrap::getObjectManager()->get(IndexerRegistry::class)
-    ->get('catalogsearch_fulltext')
+    ->get(FulltextIndexer::INDEXER_ID)
     ->reindexAll();

dev/tests/integration/testsuite/Magento/Store/_files/core_fixturestore.php

@@ -25,3 +25,5 @@
     /* Refresh stores memory cache */
     Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class)->reinitStores();
 }
+
+//if test using this fixture relies on full text functionality it is required to explicitly perform re-indexation