Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion test/integration/account-creation-oidc-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const supertest = require('supertest')
// Helper functions for the FS
const $rdf = require('rdflib')

const { rm, read } = require('../utils')
const { rm, read, checkDnsSettings } = require('../utils')
const ldnode = require('../../index')
const path = require('path')
const fs = require('fs-extra')
Expand All @@ -26,6 +26,8 @@ describe('AccountManager (OIDC account creation tests)', function () {
serverUri
})

before(checkDnsSettings)

before(function (done) {
ldpHttpsServer = ldp.listen(3457, done)
})
Expand Down
4 changes: 3 additions & 1 deletion test/integration/acl-oidc-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const assert = require('chai').assert
const fs = require('fs-extra')
const request = require('request')
const path = require('path')
const { loadProvider, rm } = require('../utils')
const { loadProvider, rm, checkDnsSettings } = require('../utils')
const IDToken = require('@trust/oidc-op/src/IDToken')

const ldnode = require('../../index')
Expand Down Expand Up @@ -60,6 +60,8 @@ const argv = {
describe('ACL HTTP', function () {
let ldp, ldpHttpsServer

before(checkDnsSettings)

before(done => {
ldp = ldnode.createServer(argv)

Expand Down
3 changes: 3 additions & 0 deletions test/integration/cors-proxy-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ var assert = require('chai').assert
var supertest = require('supertest')
var path = require('path')
var nock = require('nock')
var { checkDnsSettings } = require('../utils')

var ldnode = require('../../index')

Expand All @@ -13,6 +14,8 @@ describe('CORS Proxy', () => {
})
var server = supertest(ldp)

before(checkDnsSettings)

it('should return the website in /proxy?uri', (done) => {
nock('https://example.org').get('/').reply(200)
server.get('/proxy?uri=https://example.org/')
Expand Down
21 changes: 21 additions & 0 deletions test/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ var fsExtra = require('fs-extra')
var rimraf = require('rimraf')
var path = require('path')
const OIDCProvider = require('@trust/oidc-op')
const dns = require('dns')

const TEST_HOSTS = ['nic.localhost', 'tim.localhost', 'nicola.localhost']

exports.rm = function (file) {
return rimraf.sync(path.join(__dirname, '/resources/' + file))
Expand Down Expand Up @@ -35,6 +38,24 @@ exports.restore = function (src) {
exports.rm(src + '.bak')
}

// Verifies that all HOSTS entries are present
exports.checkDnsSettings = function () {
return Promise.all(TEST_HOSTS.map(hostname => {
return new Promise((resolve, reject) => {
dns.lookup(hostname, (error, ip) => {
if (error || ip !== '127.0.0.1') {
reject(error)
} else {
resolve(true)
}
})
})
}))
.catch(() => {
throw new Error(`Expected HOSTS entries of 127.0.0.1 for ${TEST_HOSTS.join()}`)
})
}

/**
* @param configPath {string}
*
Expand Down