From 05bb3317c3f4f33f176fc7b49c482fac3913fde0 Mon Sep 17 00:00:00 2001
From: Sebastien Mirolo <smirolo@djaodjin.com>
Date: Mon, 14 Oct 2024 08:49:30 -0700
Subject: [PATCH] runs tests against containerized app

---
 Makefile                                      |  4 ++-
 .../fixtures/40-provider-subscriptions.json   | 26 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 335d1d76..2b669bcb 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,8 @@ SYSCONFDIR    ?= $(installTop)/etc
 LOCALSTATEDIR ?= $(installTop)/var
 CONFIG_DIR    ?= $(SYSCONFDIR)/$(APP_NAME)
 ASSETS_DIR    ?= $(srcDir)/htdocs/assets
-RUN_DIR       ?= $(installTop)/var/run
+# because we are not loading DB_NAME from site.conf
+RUN_DIR       ?= $(abspath $(srcDir))
 
 installDirs   ?= /usr/bin/install -d
 installFiles  ?= /usr/bin/install -p -m 644
@@ -130,6 +131,7 @@ ifeq ($(MY_EMAIL),)
 # such that the container can be started without prior configuration.
 package-docker: build-assets initdb
 	[[ -f $(srcDir)/db.sqlite ]] || cp $(DB_FILENAME) $(srcDir)/db.sqlite
+	[[ -f $(srcDir)/cowork.sqlite ]] || cp $(DB_FILENAME) $(srcDir)/cowork.sqlite
 	cd $(srcDir) && $(DOCKER) build $(DOCKER_OPTS) .
 
 endif
diff --git a/djaoapp/fixtures/40-provider-subscriptions.json b/djaoapp/fixtures/40-provider-subscriptions.json
index affa9fe2..daa51c29 100644
--- a/djaoapp/fixtures/40-provider-subscriptions.json
+++ b/djaoapp/fixtures/40-provider-subscriptions.json
@@ -150,31 +150,5 @@
         "optin_on_request": 1
     },
     "model" : "saas.Plan", "pk": 45
-},
-
-{
-    "fields": {
-      "date_joined": "2024-01-01T00:00:00-09:00",
-      "last_login": "2024-01-01T00:00:00-09:00",
-      "email": "xia+40@localhost.localdomain",
-      "first_name": "Xia40",
-      "is_active": true,
-      "is_staff": false,
-      "is_superuser": false,
-      "last_name": "",
-      "password": "pbkdf2_sha256$10000$z0MBiWn0Rlem$iZdC6uHomlE07qGK/TqfcfxNzKJtFp03c0JILF1frRc=",
-      "username": "xia40"
-    },
-    "model": "auth.User", "pk": 40
-},
-{
-    "fields": {
-      "created_at": "2024-01-01T00:00:00+00:00",
-      "role_description": null,
-      "organization": 40,
-      "user": 40,
-      "request_key": "a00000d0a0000001234567890123456789012345"
-    },
-    "model": "saas.Role", "pk": 40
 }
 ]