Skip to content

Commit 0de193a

Browse files
committed
MTA-1478: Resolve issue with generating repository xml files using collection provider
1 parent 9bca37f commit 0de193a

File tree

6 files changed

+4
-7
lines changed

6 files changed

+4
-7
lines changed

dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getCollection(array $fixture)
6262
{
6363
$type = $fixture['type'];
6464
$method = $type . 'Collection';
65-
if (!method_exists($this, $method)) {
65+
if (!method_exists($this, $method) || empty($fixture['collection'])) {
6666
return [];
6767
}
6868

dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<module>Magento_Checkout</module>
1212
<type>flat</type>
1313
<entity_type>quote</entity_type>
14-
<collection>Magento\Checkout\Model\Resource\Cart</collection>
1514
<repository_class>Magento\Checkout\Test\Repository\Cart</repository_class>
1615
<handler_interface>Magento\Checkout\Test\Handler\Cart\CartInterface</handler_interface>
1716
<fields>

dev/tests/functional/tests/app/Magento/Checkout/Test/etc/fixture.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
<cart module="Magento_Checkout">
1010
<type>flat</type>
1111
<entity_type>quote</entity_type>
12-
<collection>Magento\Checkout\Model\Resource\Cart</collection>
1312
</cart>
1413
</fixture>

dev/tests/functional/utils/bootstrap.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616

1717
$objectManager = \Magento\Mtf\ObjectManagerFactory::getObjectManager();
1818
\Magento\Mtf\ObjectManagerFactory::configure($objectManager);
19+
20+
$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
21+
$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);

dev/tests/functional/utils/generate/factory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@
55
*/
66
require_once dirname(__DIR__) . '/' . 'bootstrap.php';
77

8-
$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
9-
$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
108
$magentoObjectManager->create('Magento\Mtf\Util\Generate\Factory')->launch();
119
\Magento\Mtf\Util\Generate\GenerateResult::displayResults();

dev/tests/functional/utils/generate/fixture.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@
55
*/
66
require_once dirname(__DIR__) . '/' . 'bootstrap.php';
77

8-
$magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
9-
$magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
108
$fieldsProvider = $magentoObjectManager->create('\Magento\Mtf\Util\Generate\Fixture\FieldsProvider');
119
$objectManager->create('Magento\Mtf\Util\Generate\Fixture', ['fieldsProvider' => $fieldsProvider])->launch();

0 commit comments

Comments
 (0)