Fix and update tests for 3.x

.github/workflows/pythonapp.yml

@@ -1,73 +1,95 @@
-name: Test Application
+name: CI
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  build:
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+          cache: pip
+      - name: Install dev dependencies
+        run: make init-ci
+      - name: Lint & format check
+        run: make check
 
+  test:
+    name: Python ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    needs: lint
     services:
       postgres:
-        image: postgres:10.8
+        image: postgres:16
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: postgres
         ports:
-          # will assign a random free host port
           - 5432/tcp
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: orm
         ports:
-          - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
+          - 3306/tcp
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-    name: Python ${{ matrix.python-version }}
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          make init-ci
-      - name: Test with pytest
+          cache: pip
+      - name: Install test dependencies
+        run: make init-ci
+      - name: Run migrations
         env:
           POSTGRES_DATABASE_HOST: localhost
+          POSTGRES_DATABASE_PORT: ${{ job.services.postgres.ports[5432] }}
           POSTGRES_DATABASE_DATABASE: postgres
           POSTGRES_DATABASE_USER: postgres
           POSTGRES_DATABASE_PASSWORD: postgres
-          POSTGRES_DATABASE_PORT: ${{ job.services.postgres.ports[5432] }}
           MYSQL_DATABASE_HOST: localhost
+          MYSQL_DATABASE_PORT: ${{ job.services.mysql.ports[3306] }}
           MYSQL_DATABASE_DATABASE: orm
           MYSQL_DATABASE_USER: root
-          MYSQL_DATABASE_PORT: ${{ job.services.mysql.ports[3306] }}
           DB_CONFIG_PATH: tests/integrations/config/database.py
         run: |
-          python orm migrate --connection postgres
-          python orm migrate --connection mysql
-          make test
-  lint:
-    runs-on: ubuntu-latest
-    name: Lint
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.6
-        uses: actions/setup-python@v3
-        with:
-          python-version: 3.12
-      - name: Install Flake8
-        run: |
-          pip install flake8-pyproject
-      - name: Lint
-        run: make lint
+          python orm migrate --connection postgres -d tests/integrations/migrations
+          python orm migrate --connection mysql -d tests/integrations/migrations
+      - name: Run tests
+        env:
+          POSTGRES_DATABASE_HOST: localhost
+          POSTGRES_DATABASE_PORT: ${{ job.services.postgres.ports[5432] }}
+          POSTGRES_DATABASE_DATABASE: postgres
+          POSTGRES_DATABASE_USER: postgres
+          POSTGRES_DATABASE_PASSWORD: postgres
+          MYSQL_DATABASE_HOST: localhost
+          MYSQL_DATABASE_PORT: ${{ job.services.mysql.ports[3306] }}
+          MYSQL_DATABASE_DATABASE: orm
+          MYSQL_DATABASE_USER: root
+          DB_CONFIG_PATH: tests/integrations/config/database.py
+        run: make test

.gitignore

@@ -17,6 +17,4 @@ coverage.xml
 .coverage
 *.log
 build
-/orm.sqlite3
-/.bootstrapped-pip
-/.ignore-pre-commit
+/.bootstrapped-*

.pre-commit-config.yaml

@@ -30,3 +30,13 @@ repos:
                 ^build|
                 ^conda
             )
+
+  - repo: local
+    hooks:
+      - id: check-test-asserts
+        name: Check tests have assertions
+        description: Ensures every test method contains at least one assert statement
+        entry: python scripts/check_test_asserts.py
+        language: system
+        files: ^tests/.*test_.*\.py$
+        pass_filenames: false

makefile

@@ -20,13 +20,15 @@ init-ci:
 
 # 	Create MySQL Database
 # 	Create Postgres Database
-test: init
+test: init test-asserts
 	python -m pytest tests
 ci:
 	make test
-check: format sort lint
+check: format sort lint test-asserts
 lint:
 	flake8 src/masoniteorm tests
+test-asserts:
+	python scripts/check_test_asserts.py
 format: init
 	black src/masoniteorm tests/
 sort: init