From 058480f1f62235078720eb181cc077cebf3ab83a Mon Sep 17 00:00:00 2001 From: Mihai Dima Date: Wed, 8 Nov 2017 19:45:45 +0200 Subject: [PATCH 1/2] fix: pg extension created with if exists --- database/migrations/001.do.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/001.do.sql b/database/migrations/001.do.sql index 2976ac96..5fb28135 100644 --- a/database/migrations/001.do.sql +++ b/database/migrations/001.do.sql @@ -1,5 +1,5 @@ -CREATE EXTENSION ltree; +CREATE EXTENSION IF NOT EXISTS ltree; /* TODO: consider using unique non-sequential ids, for security (less predictabiity) From 7edcf2e22069d2ca5186452bd56575077992b61d Mon Sep 17 00:00:00 2001 From: Mihai Dima Date: Thu, 9 Nov 2017 10:08:36 +0200 Subject: [PATCH 2/2] move factory utility into the scripts folder --- {test => scripts}/factory.js | 5 ++--- test/integration/authorization/authorization.test.js | 2 +- test/integration/authorization/organizations.test.js | 2 +- test/integration/authorization/policies.test.js | 2 +- test/integration/authorization/teams.test.js | 2 +- test/integration/authorization/users.test.js | 2 +- test/integration/authorizeOps.test.js | 2 +- test/integration/endToEnd/authorization.test.js | 2 +- test/integration/endToEnd/fullOrgStructure.test.js | 2 +- test/integration/policyOps.test.js | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) rename {test => scripts}/factory.js (98%) diff --git a/test/factory.js b/scripts/factory.js similarity index 98% rename from test/factory.js rename to scripts/factory.js index f81b08ba..201dde8e 100644 --- a/test/factory.js +++ b/scripts/factory.js @@ -2,8 +2,7 @@ const async = require('async') const _ = require('lodash') - -const utils = require('./utils') +const defaultUdaru = require('./../lib/core')() const DEFAULT_POLICY = { version: '2016-07-01', @@ -31,7 +30,7 @@ const DEFAULT_SHARED_POLICY = { } function Factory (lab, data, udaruCore) { - const udaru = udaruCore || utils.udaru + const udaru = udaruCore || defaultUdaru const records = {} function createUsers (done) { diff --git a/test/integration/authorization/authorization.test.js b/test/integration/authorization/authorization.test.js index 7d4b72f4..439696c9 100644 --- a/test/integration/authorization/authorization.test.js +++ b/test/integration/authorization/authorization.test.js @@ -2,7 +2,7 @@ const Lab = require('lab') const lab = exports.lab = Lab.script() const server = require('./../../../lib/server') -const Factory = require('../../factory') +const Factory = require('../../../scripts/factory') const BuildFor = require('./testBuilder') const organizationId = 'WONKA' diff --git a/test/integration/authorization/organizations.test.js b/test/integration/authorization/organizations.test.js index bccc96f0..417c489b 100644 --- a/test/integration/authorization/organizations.test.js +++ b/test/integration/authorization/organizations.test.js @@ -2,7 +2,7 @@ const Lab = require('lab') const lab = exports.lab = Lab.script() const server = require('./../../../lib/server') -const Factory = require('../../factory') +const Factory = require('../../../scripts/factory') const BuildFor = require('./testBuilder') const utils = require('../../utils') const { udaru } = utils diff --git a/test/integration/authorization/policies.test.js b/test/integration/authorization/policies.test.js index 9fec9c7f..9db7ce14 100644 --- a/test/integration/authorization/policies.test.js +++ b/test/integration/authorization/policies.test.js @@ -4,7 +4,7 @@ const lab = exports.lab = Lab.script() const server = require('../../../lib/server') const config = require('../../../lib/config/build-all')() -const Factory = require('../../factory') +const Factory = require('../../../scripts/factory') const BuildFor = require('./testBuilder') const utils = require('../../utils') diff --git a/test/integration/authorization/teams.test.js b/test/integration/authorization/teams.test.js index 861fe245..9fe0870d 100644 --- a/test/integration/authorization/teams.test.js +++ b/test/integration/authorization/teams.test.js @@ -6,7 +6,7 @@ const server = require('../../../lib/server') const utils = require('../../utils') const { udaru } = utils -const Factory = require('../../factory') +const Factory = require('../../../scripts/factory') const BuildFor = require('./testBuilder') const organizationId = 'WONKA' diff --git a/test/integration/authorization/users.test.js b/test/integration/authorization/users.test.js index 96f4b969..0bd73548 100644 --- a/test/integration/authorization/users.test.js +++ b/test/integration/authorization/users.test.js @@ -3,7 +3,7 @@ const Lab = require('lab') const lab = exports.lab = Lab.script() const server = require('./../../../lib/server') -const Factory = require('../../factory') +const Factory = require('../../../scripts/factory') const BuildFor = require('./testBuilder') const utils = require('../../utils') diff --git a/test/integration/authorizeOps.test.js b/test/integration/authorizeOps.test.js index 86f6e319..5f6f0b35 100644 --- a/test/integration/authorizeOps.test.js +++ b/test/integration/authorizeOps.test.js @@ -9,7 +9,7 @@ const _ = require('lodash') const testUtils = require('../utils') const { udaru } = testUtils const authorize = udaru.authorize -const Factory = require('../factory') +const Factory = require('../../scripts/factory') const fs = require('fs') const path = require('path') diff --git a/test/integration/endToEnd/authorization.test.js b/test/integration/endToEnd/authorization.test.js index ec651bd8..d11a4296 100644 --- a/test/integration/endToEnd/authorization.test.js +++ b/test/integration/endToEnd/authorization.test.js @@ -5,7 +5,7 @@ const Lab = require('lab') const lab = exports.lab = Lab.script() const utils = require('../../utils') const server = require('../../../lib/server') -const Factory = require('../../factory') +const Factory = require('../../../scripts/factory') lab.experiment('Authorization', () => { lab.test('check authorization should return access true for allowed', (done) => { diff --git a/test/integration/endToEnd/fullOrgStructure.test.js b/test/integration/endToEnd/fullOrgStructure.test.js index cff63efa..d0edf1c9 100644 --- a/test/integration/endToEnd/fullOrgStructure.test.js +++ b/test/integration/endToEnd/fullOrgStructure.test.js @@ -6,7 +6,7 @@ const lab = exports.lab = Lab.script() const config = require('../../../lib/config/build-all')() const server = require('../../../lib/server') -const Factory = require('../../factory') +const Factory = require('../../../scripts/factory') const utils = require('../../utils') const Action = config.get('AuthConfig.Action') diff --git a/test/integration/policyOps.test.js b/test/integration/policyOps.test.js index 2945e78c..09ff48f4 100644 --- a/test/integration/policyOps.test.js +++ b/test/integration/policyOps.test.js @@ -9,7 +9,7 @@ const lab = exports.lab = Lab.script() const _ = require('lodash') const async = require('async') const uuid = require('uuid/v4') -const Factory = require('../factory') +const Factory = require('../../scripts/factory') const testUtils = require('../utils') const { udaru } = testUtils