Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

Fixes #438

Merged
merged 2 commits into from
Nov 15, 2017
Merged

Fixes #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
058480f
fix: pg extension created with if exists
mihaidma Nov 8, 2017
7edcf2e
move factory utility into the scripts folder
mihaidma Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion database/migrations/001.do.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

CREATE EXTENSION ltree;
CREATE EXTENSION IF NOT EXISTS ltree;

/* TODO: consider using unique non-sequential ids, for security
(less predictabiity)
Expand Down
5 changes: 2 additions & 3 deletions test/factory.js → scripts/factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/authorization/authorization.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion test/integration/authorization/organizations.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/integration/authorization/policies.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion test/integration/authorization/teams.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion test/integration/authorization/users.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion test/integration/authorizeOps.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion test/integration/endToEnd/authorization.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/endToEnd/fullOrgStructure.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion test/integration/policyOps.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down