Merge branch 'master' into update-mashlib

Author: michielbdejong

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

@@ -7,7 +7,8 @@ const ldnode = require('../../index')
 const path = require('path')
 const fs = require('fs-extra')
 
-describe('AccountManager (OIDC account creation tests)', function () {
+// FIXME: #1502
+describe.skip('AccountManager (OIDC account creation tests)', function () {
   const port = 3457
   const serverUri = `https://localhost:${port}`
   const host = `localhost:${port}`
@@ -223,7 +224,8 @@ describe('AccountManager (OIDC account creation tests)', function () {
   })
 })
 
-describe('Single User signup page', () => {
+// FIXME: #1502
+describe.skip('Single User signup page', () => {
   const serverUri = 'https://localhost:7457'
   const port = 7457
   let ldpHttpsServer
@@ -260,7 +262,8 @@ describe('Single User signup page', () => {
   })
 })
 
-describe('Signup page where Terms & Conditions are not being enforced', () => {
+// FIXME: #1502
+describe.skip('Signup page where Terms & Conditions are not being enforced', () => {
   const port = 3457
   const host = `localhost:${port}`
   const root = path.join(__dirname, '../resources/accounts/')

test/integration/account-manager-test.js

@@ -25,7 +25,8 @@ afterEach(() => {
   fs.removeSync(path.join(__dirname, '../resources/accounts/alice.example.com'))
 })
 
-describe('AccountManager', () => {
+// FIXME #1502
+describe.skip('AccountManager', () => {
   describe('accountExists()', () => {
     const host = SolidHost.from({ serverUri: 'https://localhost' })
 

test/integration/account-template-test.js

@@ -14,7 +14,8 @@ const AccountTemplate = require('../../lib/models/account-template')
 const templatePath = path.join(__dirname, '../../default-templates/new-account')
 const accountPath = path.join(__dirname, '../resources/new-account')
 
-describe('AccountTemplate', () => {
+// FIXME #1502
+describe.skip('AccountTemplate', () => {
   beforeEach(() => {
     fs.removeSync(accountPath)
   })

test/integration/acl-oidc-test.js

@@ -56,7 +56,8 @@ const argv = {
   host: { serverUri }
 }
 
-describe('ACL with WebID+OIDC over HTTP', function () {
+// FIXME #1502
+describe.skip('ACL with WebID+OIDC over HTTP', function () {
   let ldp, ldpHttpsServer
 
   before(checkDnsSettings)

test/integration/authentication-oidc-test.js

@@ -19,7 +19,8 @@ chai.use(require('dirty-chai'))
 
 // In this test we always assume that we are Alice
 
-describe('Authentication API (OIDC)', () => {
+// FIXME #1502
+describe.skip('Authentication API (OIDC)', () => {
   let alice, bob // eslint-disable-line no-unused-vars
 
   const aliceServerUri = 'https://localhost:7000'

test/integration/capability-discovery-test.js

@@ -7,7 +7,8 @@ const supertest = require('supertest')
 const expect = require('chai').expect
 // In this test we always assume that we are Alice
 
-describe('API', () => {
+// FIXME #1502
+describe.skip('API', () => {
   let alice
 
   const aliceServerUri = 'https://localhost:5000'