Refactor tests

codeception.yml

@@ -10,10 +10,6 @@ settings:
     bootstrap: _bootstrap.php
     log: true
 
-extensions:
-    enabled:
-        - Arachne\Codeception\Tracy\Logger
-
 coverage:
     enabled: true
     include:

composer.json

@@ -13,24 +13,23 @@
     ],
     "require": {
         "php": "^5.4.0|^7.0.0",
-        "arachne/di-helpers": "~0.4.0",
+        "arachne/di-helpers": "^0.4.0",
         "nette/application": "^2.3.0",
         "nette/caching": "^2.3.0",
         "nette/di": "^2.3.0",
         "nette/http": "^2.3.0",
         "nette/utils": "^2.3.0",
-        "oops/cache-factory": "~1.0.0"
+        "oops/cache-factory": "^1.0.0"
     },
     "require-dev": {
         "php": "^5.5.0|^7.0.0",
         "arachne/bootstrap": "^0.2.1",
-        "arachne/codeception": "^0.6.3",
+        "arachne/codeception": "^0.7.0",
         "arachne/event-dispatcher": "^0.1.0",
         "codeception/codeception": "~2.2.0",
         "codeception/mockery-module": "^0.2.2",
         "enumag/application": "^0.3.5",
-        "mockery/mockery": "^0.9.0",
-        "tracy/tracy": "^2.3.0"
+        "mockery/mockery": "^0.9.0"
     },
     "autoload": {
         "psr-4": {

tests/functional.suite.yml

@@ -4,4 +4,9 @@ class_name: FunctionalSuiteTester
 
 modules:
     enabled:
-        - Arachne\Codeception\Module\Nette
+        - Arachne\Codeception\Module\NetteApplicationModule
+        - Arachne\Codeception\Module\NetteDIModule:
+            tempDir: ../_temp/integration
+            configurator: Arachne\Bootstrap\Configurator
+            configFiles:
+                - config/config.neon

tests/functional/_bootstrap.php

@@ -1,20 +1 @@
 <?php
-
-use Arachne\Bootstrap\Configurator;
-use Arachne\Codeception\Module\Nette;
-
-$configurator = new Configurator();
-$configurator->enableDebugger(__DIR__.'/../_log');
-$tempDir = __DIR__.'/../_temp/functional_'.md5(time());
-mkdir($tempDir);
-$configurator->setTempDirectory($tempDir);
-$configurator->setDebugMode(true);
-
-// Create Dependency Injection container from config.neon file
-$configurator->addConfig(__DIR__.'/config/config.neon');
-
-// Don't use this instance for anything else than console commands!
-$container = $configurator->createContainer();
-Nette::$containerClass = get_class($container);
-
-return $container;

tests/functional/config/config.neon

@@ -1,5 +1,5 @@
 extensions:
-    arachne.codeception: Arachne\Codeception\DI\CodeceptionExtension
+    codeception.http: Arachne\Codeception\DI\HttpExtension
     arachne.containeradaper: Arachne\ContainerAdapter\DI\ContainerAdapterExtension
     arachne.dihelpers.resolvers: Arachne\DIHelpers\DI\ResolversExtension
     arachne.entityloader: Arachne\EntityLoader\DI\EntityLoaderExtension