Skip to content

Commit 068d068

Browse files
committed
Merge pull request magento#114 from magento-firedrakes/MAGETWO-31479
[Firedrakes] MTF Fixtures and Repositories configuration. MTF Dynamic Generation
2 parents 1c7e9f4 + 3728557 commit 068d068

File tree

647 files changed

+5460
-12055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

647 files changed

+5460
-12055
lines changed

dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc18",
3+
"magento/mtf": "1.0.0-rc19",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

dev/tests/functional/etc/di.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
9-
<preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
10-
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
119
<virtualType name="Magento\Mtf\Config\SchemaLocator\Config" type="Magento\Mtf\Config\SchemaLocator">
1210
<arguments>
1311
<argument name="schemaPath" xsi:type="string">etc/config.xsd</argument>

dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ public function create(array $sharedInstances = [])
5252
$argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
5353
$argumentMapper = new \Magento\Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);
5454

55+
$autoloader = new \Magento\Mtf\Code\Generator\Autoloader(
56+
new \Magento\Mtf\Code\Generator(
57+
[
58+
'page' => 'Magento\Mtf\Util\Generate\Page',
59+
'repository' => 'Magento\Mtf\Util\Generate\Repository',
60+
'fixture' => 'Magento\Mtf\Util\Generate\Fixture'
61+
]
62+
)
63+
);
64+
spl_autoload_register([$autoloader, 'load']);
65+
5566
$sharedInstances['Magento\Mtf\Data\Argument\InterpreterInterface'] = $argInterpreter;
5667
$sharedInstances['Magento\Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
5768
$objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);

dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,16 @@ public function launch()
6060

6161
return $this->objectManager->get('Magento\Framework\App\ResponseInterface');
6262
}
63+
64+
/**
65+
* Generate single class.
66+
*
67+
* @param string $className
68+
* @return bool
69+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
70+
*/
71+
public function generate($className)
72+
{
73+
return false;
74+
}
6375
}

dev/tests/functional/lib/Magento/Mtf/Util/Generate/Fixture/FieldsProvider.php

Lines changed: 0 additions & 191 deletions
This file was deleted.

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

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)