Update tests

Author: enumag

tests/.gitignore

@@ -1,2 +1,2 @@
-_helpers/_generated
-*SuiteGuy.php
+_helpers/*SuiteTester.php
+_helpers/_generated/*

tests/fix.sh

@@ -1,6 +1,6 @@
 error_level: "E_ALL"
 
-class_name: IntegrationSuiteGuy
+class_name: IntegrationSuiteTester
 
 modules:
     enabled:

tests/integration.suite.yml

@@ -2,16 +2,14 @@
 
 use Arachne\Bootstrap\Configurator;
 use Arachne\Codeception\Module\Nette;
-use Nette\Bridges\Framework\NetteExtension;
 
 $configurator = new Configurator();
 $configurator->enableDebugger(__DIR__.'/../_log');
 $configurator->setTempDirectory(__DIR__.'/../_temp');
 $configurator->setDebugMode(true);
 
 // Create Dependency Injection container from config.neon file
-$section = class_exists(NetteExtension::class) ? 'nette_2.2' : 'nette_2.3';
-$configurator->addConfig(__DIR__.'/config/config.neon', $section);
+$configurator->addConfig(__DIR__.'/config/config.neon', false);
 
 // Don't use this instance for anything else than console commands!
 $container = $configurator->createContainer();

tests/integration/_bootstrap.php

@@ -1,30 +1,15 @@
-common:
-	extensions:
-		codeception: Arachne\Codeception\DI\CodeceptionExtension
-
-	services:
-		routerFactory: Tests\Integration\Classes\RouterFactory
-		router: @routerFactory::create()
-
-nette_2.2 < common:
-	extensions:
-		nette: Nette\Bridges\Framework\NetteExtension
-		enumag.application: Enumag\Application\DI\ApplicationExtension
-
-	nette:
-		application:
-			catchExceptions: null
-			mapping:
-				*: Tests\Integration\Classes\*Presenter
-
-nette_2.3 < common:
-	extensions:
-		nette.application: Nette\Bridges\ApplicationDI\ApplicationExtension
-		nette.http: Nette\Bridges\HttpDI\HttpExtension
-		nette.latte: Nette\Bridges\ApplicationDI\LatteExtension
-		enumag.application: Enumag\Application\DI\ApplicationExtension
-
-	nette.application:
-		catchExceptions: null
-		mapping:
-			*: Tests\Integration\Classes\*Presenter
+extensions:
+    codeception: Arachne\Codeception\DI\CodeceptionExtension
+    nette.application: Nette\Bridges\ApplicationDI\ApplicationExtension
+    nette.http: Nette\Bridges\HttpDI\HttpExtension
+    nette.latte: Nette\Bridges\ApplicationDI\LatteExtension
+    enumag.application: Enumag\Application\DI\ApplicationExtension
+
+services:
+    routerFactory: Tests\Integration\Fixtures\RouterFactory
+    router: @routerFactory::create()
+
+nette.application:
+    catchExceptions: null
+    mapping:
+        *: Tests\Integration\Fixtures\*Presenter

tests/integration/config/config.neon

@@ -2,44 +2,44 @@
 
 namespace Tests\Integration;
 
-use Codeception\TestCase\Test;
+use Codeception\Test\Unit;
 use Nette\Application\Application;
 
 /**
  * @author Jáchym Toušek <[email protected]>
  */
-class ApplicationTest extends Test
+class ApplicationTest extends Unit
 {
     public function testApplication()
     {
-        $this->assertInstanceOf(Application::class, $this->guy->grabService(Application::class));
+        $this->assertInstanceOf(Application::class, $this->tester->grabService(Application::class));
     }
 
     public function testPage()
     {
-        $this->guy->amOnPage('/article/page');
-        $this->guy->seeResponseCodeIs(200);
-        $this->guy->see('headline', 'h1');
+        $this->tester->amOnPage('/article/page');
+        $this->tester->seeResponseCodeIs(200);
+        $this->tester->see('headline', 'h1');
     }
 
     public function testLink()
     {
-        $this->guy->amOnPage('/article/link');
-        $this->guy->seeResponseCodeIs(200);
-        $this->guy->see('Normal link');
-        $this->guy->seeLink('Normal link', '/article/page');
+        $this->tester->amOnPage('/article/link');
+        $this->tester->seeResponseCodeIs(200);
+        $this->tester->see('Normal link');
+        $this->tester->seeLink('Normal link', '/article/page');
     }
 
     public function testRedirect()
     {
-        $this->guy->amOnPage('/article/redirect');
-        $this->guy->seeResponseCodeIs(301);
-        $this->guy->seeRedirectTo('/article/page');
+        $this->tester->amOnPage('/article/redirect');
+        $this->tester->seeResponseCodeIs(301);
+        $this->tester->seeRedirectTo('/article/page');
     }
 
     public function testUnknown()
     {
-        $this->guy->amOnPage('/article/unknown');
-        $this->guy->seeResponseCodeIs(404);
+        $this->tester->amOnPage('/article/unknown');
+        $this->tester->seeResponseCodeIs(404);
     }
 }

tests/integration/src/ApplicationTest.php

@@ -2,16 +2,16 @@
 
 namespace Tests\Integration;
 
-use Codeception\TestCase\Test;
+use Codeception\Test\Unit;
 use Nette\DI\Container;
 
 /**
  * @author Jáchym Toušek <[email protected]>
  */
-class DITest extends Test
+class DITest extends Unit
 {
     public function testContainer()
     {
-        $this->assertInstanceOf(Container::class, $this->guy->grabService(Container::class));
+        $this->assertInstanceOf(Container::class, $this->tester->grabService(Container::class));
     }
 }

tests/integration/src/DITest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Integration\Classes;
+namespace Tests\Integration\Fixtures;
 
 use Nette\Application\UI\Presenter;
 

…gration/src/Classes/ArticlePresenter.php …ration/src/Fixtures/ArticlePresenter.phptests/integration/src/Classes/ArticlePresenter.php renamed to tests/integration/src/Fixtures/ArticlePresenter.php tests/integration/src/Classes/ArticlePresenter.php renamed to tests/integration/src/Fixtures/ArticlePresenter.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Integration\Classes;
+namespace Tests\Integration\Fixtures;
 
 use Nette\Application\IRouter;
 use Nette\Application\Routers\Route;

…ntegration/src/Classes/RouterFactory.php …tegration/src/Fixtures/RouterFactory.phptests/integration/src/Classes/RouterFactory.php renamed to tests/integration/src/Fixtures/RouterFactory.php tests/integration/src/Classes/RouterFactory.php renamed to tests/integration/src/Fixtures/RouterFactory.php

@@ -1,3 +1,3 @@
 <a n:href="Article:page">
-	Normal link
+    Normal link
 </a>