Skip to content

Commit

Permalink
Merge pull request magento#114 from magento-firedrakes/MAGETWO-31479
Browse files Browse the repository at this point in the history
[Firedrakes] MTF Fixtures and Repositories configuration. MTF Dynamic Generation
  • Loading branch information
sivaschenko committed Mar 3, 2015
2 parents 1c7e9f4 + 3728557 commit 068d068
Show file tree
Hide file tree
Showing 647 changed files with 5,460 additions and 12,055 deletions.
2 changes: 1 addition & 1 deletion dev/tests/functional/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"magento/mtf": "1.0.0-rc18",
"magento/mtf": "1.0.0-rc19",
"php": "~5.5.0|~5.6.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
Expand Down
2 changes: 0 additions & 2 deletions dev/tests/functional/etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
<virtualType name="Magento\Mtf\Config\SchemaLocator\Config" type="Magento\Mtf\Config\SchemaLocator">
<arguments>
<argument name="schemaPath" xsi:type="string">etc/config.xsd</argument>
Expand Down
11 changes: 11 additions & 0 deletions dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ public function create(array $sharedInstances = [])
$argInterpreter = $this->createArgumentInterpreter(new BooleanUtils());
$argumentMapper = new \Magento\Mtf\ObjectManager\Config\Mapper\Dom($argInterpreter);

$autoloader = new \Magento\Mtf\Code\Generator\Autoloader(
new \Magento\Mtf\Code\Generator(
[
'page' => 'Magento\Mtf\Util\Generate\Page',
'repository' => 'Magento\Mtf\Util\Generate\Repository',
'fixture' => 'Magento\Mtf\Util\Generate\Fixture'
]
)
);
spl_autoload_register([$autoloader, 'load']);

$sharedInstances['Magento\Mtf\Data\Argument\InterpreterInterface'] = $argInterpreter;
$sharedInstances['Magento\Mtf\ObjectManager\Config\Mapper\Dom'] = $argumentMapper;
$objectManager = new $this->locatorClassName($factory, $diConfig, $sharedInstances);
Expand Down
12 changes: 12 additions & 0 deletions dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,16 @@ public function launch()

return $this->objectManager->get('Magento\Framework\App\ResponseInterface');
}

/**
* Generate single class.
*
* @param string $className
* @return bool
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function generate($className)
{
return false;
}
}

This file was deleted.

This file was deleted.

Loading

0 comments on commit 068d068

Please sign in to comment.