Ensure that tests use test config.

Author: RubenVerborgh

test/integration/account-creation-oidc-test.js

@@ -12,10 +12,12 @@ describe('AccountManager (OIDC account creation tests)', function () {
   var host = 'localhost:3457'
   var ldpHttpsServer
   let rootPath = path.join(__dirname, '../resources/accounts/')
+  let configPath = path.join(__dirname, '../resources/config')
   let dbPath = path.join(__dirname, '../resources/accounts/db')
 
   var ldp = ldnode.createServer({
     root: rootPath,
+    configPath,
     sslKey: path.join(__dirname, '../keys/key.pem'),
     sslCert: path.join(__dirname, '../keys/cert.pem'),
     auth: 'oidc',
@@ -206,9 +208,11 @@ describe('Single User signup page', () => {
   const port = 7457
   var ldpHttpsServer
   const rootDir = path.join(__dirname, '../resources/accounts/single-user/')
+  const configPath = path.join(__dirname, '../resources/config')
   const ldp = ldnode.createServer({
     port,
     root: rootDir,
+    configPath,
     sslKey: path.join(__dirname, '../keys/key.pem'),
     sslCert: path.join(__dirname, '../keys/cert.pem'),
     webid: true,

test/integration/acl-tls-test.js

@@ -20,6 +20,7 @@ var ns = require('solid-namespace')($rdf)
 
 var address = 'https://localhost:3456/test/'
 let rootPath = path.join(__dirname, '../resources')
+let configPath = path.join(rootPath, 'config')
 
 var aclExtension = '.acl'
 var metaExtension = '.meta'
@@ -53,6 +54,7 @@ describe('ACL with WebID+TLS', function () {
   var ldp = ldnode.createServer({
     mount: '/test',
     root: rootPath,
+    configPath,
     sslKey: path.join(__dirname, '../keys/key.pem'),
     sslCert: path.join(__dirname, '../keys/cert.pem'),
     webid: true,

test/integration/auth-proxy-test.js

@@ -20,6 +20,7 @@ describe('Auth Proxy', () => {
       // Set up Solid server
       server = ldnode({
         root: path.join(__dirname, '../resources/auth-proxy'),
+        configPath: path.join(__dirname, '../resources/config'),
         authProxy: {
           '/server/a': 'http://server-a.org'
         },

test/integration/authentication-oidc-test.js

@@ -23,7 +23,7 @@ describe('Authentication API (OIDC)', () => {
 
   let aliceServerUri = 'https://localhost:7000'
   let aliceWebId = 'https://localhost:7000/profile/card#me'
-  let configPath = path.join(__dirname, '../../config')
+  let configPath = path.join(__dirname, '../resources/config')
   let aliceDbPath = path.join(__dirname,
     '../resources/accounts-scenario/alice/db')
   let userStorePath = path.join(aliceDbPath, 'oidc/users')

test/integration/capability-discovery-test.js

@@ -9,7 +9,7 @@ describe('API', () => {
   let alice
 
   let aliceServerUri = 'https://localhost:5000'
-  let configPath = path.join(__dirname, '../../config')
+  let configPath = path.join(__dirname, '../resources/config')
   let aliceDbPath = path.join(__dirname,
     '../resources/accounts-scenario/alice/db')
   let aliceRootPath = path.join(__dirname, '../resources/accounts-scenario/alice')

test/integration/errors-oidc-test.js

@@ -8,10 +8,12 @@ describe('OIDC error handling', function () {
   const serverUri = 'https://localhost:3457'
   var ldpHttpsServer
   const rootPath = path.join(__dirname, '../resources/accounts/errortests')
+  const configPath = path.join(__dirname, '../resources/config')
   const dbPath = path.join(__dirname, '../resources/accounts/db')
 
   const ldp = ldnode.createServer({
     root: rootPath,
+    configPath,
     sslKey: path.join(__dirname, '../keys/key.pem'),
     sslCert: path.join(__dirname, '../keys/cert.pem'),
     auth: 'oidc',

test/integration/patch-test.js

@@ -10,8 +10,10 @@ const { read, rm, backup, restore } = require('../utils')
 const port = 7777
 const serverUri = `https://tim.localhost:${port}`
 const root = path.join(__dirname, '../resources/patch')
+const configPath = path.join(__dirname, '../resources/config')
 const serverOptions = {
   root,
+  configPath,
   serverUri,
   multiuser: false,
   webid: true,

test/resources/config/templates

@@ -0,0 +1 @@
+../../../default-templates/

test/resources/config/views

@@ -0,0 +1 @@
+../../../default-views/