diff of a680e6a47983d37461089085c00da9eacab59ee6
a680e6a47983d37461089085c00da9eacab59ee6
diff --git a/.github/workflows/build_murja.yml b/.github/workflows/build_murja.yml
index 4ad87bf..595f86f 100644
--- a/.github/workflows/build_murja.yml
+++ b/.github/workflows/build_murja.yml
@@ -1,15 +1,51 @@
on:
push:
- branches: [main]
-
-
+ branches:
+ - '*'
+
env:
REGISTRY: ghcr.io
IMAGE_NAME: aggressive-murja
jobs:
+ test-lisp:
+ name: Runs the lisp integration tests
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: read
+ steps:
+ - uses: actions/checkout@v2
+ name: Checkout code
+
+ - name: Fetch quicklisp
+ run: |
+ curl https://beta.quicklisp.org/quicklisp.lisp -o ./quicklisp.lisp
+
+ - name: Start db
+ run: |
+ docker-compose up -d automatic-test-db
+ - name: Setup and run tests
+ uses: addnab/docker-run-action@v3
+ with:
+ image: fukamachi/sbcl:latest
+ options: -v ${{ github.workspace }}:/workspace -v ${{ github.workspace }}/config:/etc/murja -e MURJA_DB_HOST=db -e MURJA_E2E=e2e -p 3010:3010 --network aggressive-murja_murja_test_network
+ run: |
+ cd /workspace
+
+ sbcl --load ./quicklisp.lisp --load ./install_ql.lisp
+
+ current_dir=$(pwd)
+ cd $HOME
+
+ mkdir ~/common-lisp
+ cd ~/common-lisp
+ ln -s $current_dir
+ cd /workspace
+ sbcl --load run_tests.lisp
build:
name: "Build murja image"
+ needs: test-lisp
runs-on: 'ubuntu-latest'
permissions:
contents: read
@@ -58,9 +94,10 @@ jobs:
ghcr.io/feuery/murja:latest
ghcr.io/feuery/murja:${{ github.sha }}
labels: ${{ steps.meta.outputs.labels }}
-
+
test-playwright:
- name: Runs playwright browserr tests
+ name: Runs playwright browser tests
+ if: false
needs: build
runs-on: ubuntu-latest
permissions:
@@ -73,7 +110,7 @@ jobs:
- name: Start the database
run: |
- docker-compose up -d
+ docker-compose up -d db
- name: Start murja
id: tests
diff --git a/run_tests.lisp b/run_tests.lisp
index 4f5aa54..bf86adb 100644
--- a/run_tests.lisp
+++ b/run_tests.lisp
@@ -1,3 +1,3 @@
(ql:quickload :aggressive-murja-tests)
-(unless (fiveam:run! 'murja.tests/main:main-suite)
+(unless (fiveam:run! 'murja.tests:main-suite)
(sb-ext:exit :code 666))
diff --git a/test/tests.lisp b/test/tests.lisp
index 2e37177..42d695d 100644
--- a/test/tests.lisp
+++ b/test/tests.lisp
@@ -1,7 +1,7 @@
(defpackage murja.tests
(:use :cl
:fiveam)
- (:export ))
+ (:export :main-suite))
(in-package :murja.tests)
@@ -20,21 +20,15 @@
(postmodern:execute "DROP TABLE IF EXISTS public.ragtime_migrations")
(postmodern:execute "DROP TABLE IF EXISTS public.migrations_tracker")
- ;; (format t "Doing migrations: ~%")
-
- ;; (murja.migrations:migrate)
-
- ;; (format t "Done migrations: ~%")
-
(unwind-protect
(progn
(setf *test-server* (murja:start-server :port *test-port*))
(format t "Starting the test &body~%")
(&body))
- ;; (postmodern:execute "DROP SCHEMA IF EXISTS blog CASCADE;")
- ;; (postmodern:execute "DROP TABLE IF EXISTS public.ragtime_migrations")
- ;; (postmodern:execute "DROP TABLE IF EXISTS public.migrations_tracker")
+ (postmodern:execute "DROP SCHEMA IF EXISTS blog CASCADE;")
+ (postmodern:execute "DROP TABLE IF EXISTS public.ragtime_migrations")
+ (postmodern:execute "DROP TABLE IF EXISTS public.migrations_tracker")
(hunchentoot:stop *test-server*)
(setf *test-server* nil)))))