Merge pull request #1327 from Koen1999/moretests

Added more tests

.github/workflows/unit-tests.yml

@@ -12,19 +12,6 @@ jobs:
         name: PHPUnit
         runs-on: ubuntu-latest
 
-        # Create a MySQL service.
-        services:
-            mysql:
-                image: mariadb
-                env:
-                    MYSQL_ROOT_PASSWORD: gewis
-                    MYSQL_DATABASE: gewis
-                    MYSQL_USER: gewis
-                    MYSQL_PASSWORD: gewis
-                ports:
-                    - 3306:3306
-                options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
         steps:
             -   name: Checkout
                 uses: actions/checkout@v2
@@ -63,14 +50,5 @@ jobs:
                 with:
                     env-file: .env.dist
 
-            -   name: Create database
-                # GitHub Actions do not support custom hostnames like in Docker, hence we need to overwrite this value.
-                # Furthermore, we cannot declare it above, as it will be overwritten by the previous step.
-                env:
-                    DOCKER_DB_HOST: 127.0.0.1
-                run: ./orm orm:schema-tool:update --force
-
             -   name: Run PHPUnit
-                env:
-                    DOCKER_DB_HOST: 127.0.0.1
                 run: vendor/phpunit/phpunit/phpunit --bootstrap bootstrap.php --configuration phpunit.xml

Makefile

@@ -47,13 +47,11 @@ updatedb: rundev
 stop:
 		@docker-compose down
 
-runtest: rundev
-		@docker-compose exec -T web ./vendor/phpunit/phpunit/phpunit --bootstrap ./bootstrap.php --configuration ./phpunit.xml
+runtest:
+		./vendor/phpunit/phpunit/phpunit --bootstrap ./bootstrap.php --configuration ./phpunit.xml --stop-on-error --stop-on-failure
 
-runcoverage: rundev
-		@docker-compose exec web ./vendor/phpunit/phpunit/phpunit --bootstrap ./bootstrap.php --configuration ./phpunit.xml --coverage-html ./coverage
-		@rm -r ./coverage
-		@docker cp gewisweb_web_1:/code/coverage ./coverage
+runcoverage:
+		./vendor/phpunit/phpunit/phpunit --bootstrap ./bootstrap.php --configuration ./phpunit.xml --coverage-html ./coverage
 
 getvendordir:
 		@rm -Rf ./vendor

composer.json

@@ -66,6 +66,7 @@
         "laminas/laminas-stdlib": "^3.6.1",
         "laminas/laminas-validator": "^2.15.0",
         "laminas/laminas-view": "^2.14.0",
+        "doctrine/dbal": "^3.0.0",
         "doctrine/orm": "^2.10.3",
         "doctrine/doctrine-module": "^4.3.0",
         "doctrine/doctrine-orm-module": "^4.2.0",
@@ -80,6 +81,7 @@
         "cweagans/composer-patches": "^1.7.1"
     },
     "require-dev": {
+        "ext-pdo_sqlite": "*",
         "ext-simplexml": "*",
         "ext-xdebug": "^3.0.0",
         "laminas/laminas-component-installer": "^2.6.0",
@@ -163,6 +165,7 @@
             "ActivityTest\\": "module/Activity/test",
             "ApplicationTest\\": "module/Application/test",
             "CompanyTest\\": "module/Company/test",
+            "DecisionTest\\": "module/Decision/test",
             "EducationTest\\": "module/Education/test",
             "FrontpageTest\\": "module/Frontpage/test",
             "PhotoTest\\": "module/Photo/test",