fix: properly set up environment variables for all tests

.env

@@ -1,4 +1,5 @@
 DATABASE_URL=postgresql://postgres@localhost:5432/postgres
+DATABASE_SCHEMA=wallets
 PUBLIC_KEY="-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0TAZxAOzssQpOxsVAu/f\nU9umSpLuDfm4kKyVS1F/XSf1cMj2u9C3udtk51ttYurqdL9zKuUM61dIFXc0/AVn\nhZQFrTdn8wbQVP6dDqfhYHJh6xfZj13ZwvbjGikHpaAhOxAtrtc8ZkXHIhxFuOD0\ngTonEnYVF2BggHbfgYIlKzVimROva0BrsPUBYJRnX8dp5oH7z9kt543Crxmhg7ui\nnr8tfvKPq2NTV7LYm5YnuJQrWSif6EvOxBhUDXRFYi8lF+8uAuL7DTepn2TlduwT\nXaSYOf6W7igifkRU5yIa/yfcTYBSpfa+OcQc/H871M5ywRAI66SB7gUGBSQBMUz+\n86K2/uaYYcE0rAhiaB6HcuO9ajvv+YYaJ6L2WzBdnf9uQj986Y0zBzH97yuJ1R1i\nc968h2iJy2kPaz3VHIYI9x8yA0/yp5tIR7cGWWLE41+Kc5GlenWKAXR0oNCWqLD0\nTF+EkthxSl3EdaDt+SdRqDAXKQ1zDZ64ezeLyppH9Jq4vIwHSmo7psNVdGbkxFhY\nDf2Ky2Q0A9abT9kGoClKureASz2zpWygmQd2FSmf7DHiolm//nK8z3cZNzPdrJXs\nCZnS5kaqijw9oVw/PW9aMw0Nl42qruVDHtjyH79HA92mKsBqqn5diD18CZZGgXQp\nP9I0ZN1KCnvFuUCsDhd75RkCAwEAAQ==\n-----END PUBLIC KEY-----"
 PRIVATE_KEY="-----BEGIN RSA PRIVATE KEY-----\n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\n-----END RSA PRIVATE KEY-----"
 NODE_LOG_LEVEL=trace

__tests__/seed.js

@@ -1,15 +1,9 @@
 /*
  * seed data to DB for testing
  */
-const pool = require('../server/database/database.js');
 const uuid = require('uuid');
 const log = require('loglevel');
-const assert = require('assert');
-const knex = require('knex')({
- client: 'pg',
-// debug: true,
- connection: require('../config/config').connectionString,
-});
+const knex = require("../server/database/knex");
 
 
 const apiKey = 'FORTESTFORTESTFORTESTFORTESTFORTEST';
@@ -130,7 +124,7 @@ async function seed() {
  });
 
  //walletC
- await knex('wallet')
+ await knex('wallets.wallet')
  .insert({
  id: walletC.id,
  type: walletC.type,
@@ -150,45 +144,6 @@ async function seed() {
  state: "trusted",
  });
 
-// //entity
-// await knex('entity')
-// .insert({
-// id: wallet.id,
-// type: wallet.type,
-// name: wallet.name,
-// wallet: wallet.name,
-// password: wallet.passwordHash,
-// salt: wallet.salt,
-// });
-
-
- //entity role
-// log.debug('insert role');
-// await knex('entity_role')
-// .insert([{
-// entity_id: wallet.id,
-// role_name: 'list_trees',
-// enabled: true,
-// },{
-// entity_id: wallet.id,
-// role_name: 'manage_accounts',
-// enabled: true,
-// },{
-// entity_id: wallet.id,
-// role_name: 'accounts',
-// enabled: true,
-// }]);
-
-
-// //tree
-// await knex('trees')
-// .insert({
-// id: tree.id,
-// time_created: new Date(),
-// time_updated: new Date(),
-// });
-
-
  // token
  log.log('seed token');
  await knex('token')
@@ -209,8 +164,6 @@ async function clear() {
  await knex('transaction').del();
  await knex('token').del();
  await knex('wallet').del();
-// await knex('entity_role').del();
-// await knex('entity').del();
  await knex('wallet_trust').del();
  await knex('transfer').del();
 }

package.json

@@ -10,11 +10,11 @@
  "eslint": "eslint --report-unused-disable-directives .",
  "eslint:fix": "npm run eslint -- --fix",
  "test": "npm run test-unit; npm run test-integration;npm run test-repository",
- "test-unit": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --exit ./server/models/**/*.spec.js ./server/routes/**/*.spec.js",
- "test-repository": "NODE_ENV=test mocha -r dotenv/config --exit --require co-mocha ./server/repositories/**/*.spec.js",
+ "test-unit": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --exit --require co-mocha ./server/models/**/*.spec.js ./server/routes/**/*.spec.js",
+ "test-repository": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --exit --require co-mocha ./server/repositories/**/*.spec.js",
  "server-test": "DEBUG=loopback:*,express:* NODE_LOG_LEVEL=debug nodemon server/serverTest.js",
  "server": "nodemon server/server.js",
- "test-seedDB": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --timeout 10000 --require co-mocha './**/*.spec.js'",
+ "test-seedDB": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --timeout 10000 --require co-mocha './__tests__/seed.spec.js'",
  "test-integration": "NODE_ENV=test mocha -r dotenv/config dotenv_config_path=.env.test --exit --timeout 20000 --require co-mocha './__tests__/supertest.js'",
  "test-watch": "NODE_ENV=test NODE_LOG_LEVEL=info mocha -r dotenv/config dotenv_config_path=.env.test --timeout 10000 --require co-mocha -w -b --ignore './server/repositories/**/*.spec.js' './server/setup.js' './server/**/*.spec.js' './__tests__/seed.spec.js' './__tests__/supertest.js'",
  "test-watch-debug": "NODE_ENV=test NODE_LOG_LEVEL=debug mocha -r dotenv/config dotenv_config_path=.env.test --timeout 10000 --require co-mocha -w -b --ignore './server/repositories/**/*.spec.js' './server/setup.js' './server/**/*.spec.js' './__tests__/seed.spec.js' './__tests__/supertest.js'",

server/database/knex.js

@@ -1,3 +1,4 @@
+require('dotenv').config()
 const expect = require('expect-runtime');
 const connection = require('../../config/config').connectionString;
 expect(connection).to.match(/^postgresql:\//);