Skip to content

Commit

Permalink
runs tests against containerized app
Browse files Browse the repository at this point in the history
  • Loading branch information
smirolo committed Oct 14, 2024
1 parent 290edbe commit 05bb331
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
26 changes: 0 additions & 26 deletions djaoapp/fixtures/40-provider-subscriptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "[email protected]",
"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
}
]

0 comments on commit 05bb331

Please sign in to comment.