Tests: redefine

Author: f3l1x

.github/workflows/main.yaml

@@ -222,6 +222,15 @@ jobs:
 
     if: "github.event_name == 'push'"
 
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: tests
+        ports:
+          - 3306:3306
+
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"

tests/.coveralls.yml

@@ -1,4 +1,4 @@
 # for php-coveralls
-service_name: travis-ci
+service_name: github-actions
 coverage_clover: coverage.xml
-json_path: coverage.json
+json_path: coverage.json

tests/bootstrap.container.php

@@ -25,11 +25,11 @@
         host: 127.0.0.1
         username: root
         password: ""
-        database: nextras
-   
+        database: tests
+
     orm:
         model: Tests\Mocks\Model\SimpleModel
-        
+
     services:
         - Nette\Caching\Storages\DevNullStorage
         - Nette\Caching\Cache

tests/cases/integration/BooksTest.phpt tests/cases/E2E/BooksTest.phpttests/cases/integration/BooksTest.phpt renamed to tests/cases/E2E/BooksTest.phpt

@@ -1,16 +1,14 @@
 <?php declare(strict_types = 1);
 
-namespace Tests\Cases\Integration;
-
-/**
- * @Test: [integration] Books
- */
+namespace Tests\Cases\E2E;
 
 use Contributte\Nextras\Orm\QueryObject\Queryable;
 use Contributte\Nextras\Orm\QueryObject\QueryObjectContextAwareManager;
 use Contributte\Nextras\Orm\QueryObject\QueryObjectManager;
 use Nette\DI\Container;
+use Nextras\Dbal\IConnection;
 use Nextras\Dbal\Result\Result;
+use Nextras\Dbal\Utils\FileImporter;
 use Nextras\Orm\Collection\ICollection;
 use Tester\Assert;
 use Tester\TestCase;
@@ -33,6 +31,13 @@ final class BooksTest extends TestCase
 		$this->container = $container;
 	}
 
+	protected function setUp(): void
+	{
+		/** @var IConnection $connection */
+		$connection = $this->container->getByType(IConnection::class);
+		FileImporter::executeFile($connection, __DIR__ . '/../../fixtures/mysql.sql');
+	}
+
 	/**
 	 * Test empty results
 	 */

tests/cases/unit/QueryObject.phpt tests/cases/QueryObject.phpttests/cases/unit/QueryObject.phpt renamed to tests/cases/QueryObject.phpt

@@ -1,15 +1,11 @@
 <?php declare(strict_types = 1);
 
-/**
- * @Test: [unit] Contributte\Nextras\Orm\QueryObject\QueryObject
- */
-
 use Nextras\Dbal\Drivers\Mysqli\MysqliDriver;
 use Nextras\Dbal\QueryBuilder\QueryBuilder;
 use Tester\Assert;
 use Tests\Mocks\SimpleQueryObject;
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 test(function (): void {
 	$qo = new SimpleQueryObject();

…sts/cases/unit/QueryObjectExtension.phpt tests/cases/QueryObjectExtension.phpttests/cases/unit/QueryObjectExtension.phpt renamed to tests/cases/QueryObjectExtension.phpt tests/cases/unit/QueryObjectExtension.phpt renamed to tests/cases/QueryObjectExtension.phpt

@@ -1,17 +1,13 @@
 <?php declare(strict_types = 1);
 
-/**
- * @Test: [unit] Contributte\Nextras\Orm\QueryObject\DI\NextrasQueryObjectExtension
- */
-
 use Contributte\Nextras\Orm\QueryObject\DI\NextrasQueryObjectExtension;
 use Contributte\Nextras\Orm\QueryObject\QueryObjectManager;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
 use Tester\Assert;
 
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__ . '/../bootstrap.php';
 
 test(function (): void {
 	$loader = new ContainerLoader(TEMP_DIR);