Merge remote-tracking branch 'bulk/async-webapi-2' into async-webapi-2

vrann · vrann · commit 6c6e4d4e8069 · 2018-03-29T19:36:08.000-05:00
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
@@ -136,7 +136,7 @@ private function getStoredOperationData()
     {
         /** @var MetadataPool $metadataPool */
         $metadataPool = $this->objectManager->get(MetadataPool::class);
-        $operationMetadata = $metadataPool->getMetadata(DetailedOperationObStatusInterface::class);
+        $operationMetadata = $metadataPool->getMetadata(DetailedOperationStatusInterface::class);
         /** @var ResourceConnection $resourceConnection */
         $resourceConnection = $this->objectManager->get(ResourceConnection::class);
         $connection = $resourceConnection->getConnectionByName($operationMetadata->getEntityConnectionName());

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private function getStoredOperationData()`
`136`	`136`	`{`
`137`	`137`	`/** @var MetadataPool $metadataPool */`
`138`	`138`	`$metadataPool = $this->objectManager->get(MetadataPool::class);`
`139`		`- $operationMetadata = $metadataPool->getMetadata(DetailedOperationObStatusInterface::class);`
	`139`	`+ $operationMetadata = $metadataPool->getMetadata(DetailedOperationStatusInterface::class);`
`140`	`140`	`/** @var ResourceConnection $resourceConnection */`
`141`	`141`	`$resourceConnection = $this->objectManager->get(ResourceConnection::class);`
`142`	`142`	`$connection = $resourceConnection->getConnectionByName($operationMetadata->getEntityConnectionName());`