From 8bba954930988ebfdfe7335eb48d687e88e7707f Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 23 Dec 2022 10:49:18 +0100 Subject: [PATCH] minor on tests --- release.sh | 4 ++-- server/api/models/index.js | 1 - tests/app.test.js | 25 +++++++++++++++---------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/release.sh b/release.sh index 790d7dd7..26a4a0fc 100755 --- a/release.sh +++ b/release.sh @@ -4,7 +4,7 @@ rm -fr node_modules yarn yarn build yarn pack -# yarn publish +yarn publish gpg --pinentry-mode loopback --passphrase `pass underscore/pgp` --detach-sign --local-user 5DAC477D5441B7A15ACBF680BBEB4DD39AC6CCA9 gancio-$RELEASE.tgz cp gancio-$RELEASE.tgz releases/ mv gancio-$RELEASE.tgz releases/latest.tgz @@ -12,4 +12,4 @@ cp gancio-$RELEASE.tgz.sig releases/ mv gancio-$RELEASE.tgz.sig releases/latest.tgz.sig yarn doc rsync -a docs/_site/ --chown=www-data:www-data cisti.web:/var/www/gancio/ -cd docs +cd docs \ No newline at end of file diff --git a/server/api/models/index.js b/server/api/models/index.js index be5308bb..af93c41f 100644 --- a/server/api/models/index.js +++ b/server/api/models/index.js @@ -29,7 +29,6 @@ const models = { const db = { sequelize: null, loadModels () { - for (const modelName in models) { const m = models[modelName](db.sequelize, Sequelize.DataTypes) DB[modelName] = m diff --git a/tests/app.test.js b/tests/app.test.js index 8411c6c2..b55656f9 100644 --- a/tests/app.test.js +++ b/tests/app.test.js @@ -21,16 +21,21 @@ beforeAll(async () => { default: process.env.config_path = path.resolve(__dirname, './seeds/config.sqlite.json') } - app = await require('../server/routes.js').main() - const { sequelize } = require('../server/api/models/index') - await sequelize.query('DELETE FROM settings') - await sequelize.query('DELETE FROM events') - await sequelize.query('DELETE FROM users') - await sequelize.query('DELETE FROM ap_users') - await sequelize.query('DELETE FROM tags') - await sequelize.query('DELETE FROM places') - await sequelize.query('DELETE FROM collections') - await sequelize.query('DELETE FROM filters') + try { + app = await require('../server/routes.js').main() + const { sequelize } = require('../server/api/models/index') + await sequelize.query('DELETE FROM settings') + await sequelize.query('DELETE FROM events') + await sequelize.query('DELETE FROM user_followers') + await sequelize.query('DELETE FROM users') + await sequelize.query('DELETE FROM ap_users') + await sequelize.query('DELETE FROM tags') + await sequelize.query('DELETE FROM places') + await sequelize.query('DELETE FROM filters') + await sequelize.query('DELETE FROM collections') + } catch (e) { + console.error(e) + } }) afterAll(async () => {