Should not remove dirs in test...

Author: megoth

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

@@ -2,7 +2,7 @@ const supertest = require('supertest')
 // Helper functions for the FS
 const $rdf = require('rdflib')
 
-const { rm, read, checkDnsSettings } = require('../utils')
+const { rm, read, checkDnsSettings, cleanDir } = require('../utils')
 const ldnode = require('../../index')
 const path = require('path')
 const fs = require('fs-extra')
@@ -37,8 +37,7 @@ describe('AccountManager (OIDC account creation tests)', function () {
   after(function () {
     if (ldpHttpsServer) ldpHttpsServer.close()
     fs.removeSync(path.join(dbPath, 'oidc/users/users'))
-    fs.removeSync(path.join(rootPath, 'localhost'))
-    fs.removeSync(path.join(rootPath, 'localhost'))
+    cleanDir(path.join(rootPath, 'localhost'))
   })
 
   var server = supertest(serverUri)

test/integration/acl-oidc-test.js

@@ -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, checkDnsSettings } = require('../utils')
+const { loadProvider, rm, checkDnsSettings, cleanDir } = require('../utils')
 const IDToken = require('@solid/oidc-op/src/IDToken')
 
 const ldnode = require('../../index')
@@ -86,7 +86,7 @@ describe('ACL with WebID+OIDC over HTTP', function () {
 
   after(() => {
     if (ldpHttpsServer) ldpHttpsServer.close()
-    fs.removeSync(path.join(rootPath))
+    cleanDir(rootPath)
   })
 
   const origin1 = 'http://example.org/'

test/integration/acl-tls-test.js

@@ -3,6 +3,7 @@ var fs = require('fs-extra')
 var $rdf = require('rdflib')
 var request = require('request')
 var path = require('path')
+var { cleanDir } = require('../utils')
 
 /**
  * Note: this test suite requires an internet connection, since it actually
@@ -69,7 +70,7 @@ describe('ACL with WebID+TLS', function () {
 
   after(function () {
     if (ldpHttpsServer) ldpHttpsServer.close()
-    fs.removeSync(path.join(rootPath))
+    cleanDir(rootPath)
   })
 
   function createOptions (path, user) {

test/integration/auth-proxy-test.js

@@ -3,7 +3,7 @@ const path = require('path')
 const nock = require('nock')
 const request = require('supertest')
 const { expect } = require('chai')
-const rmDir = require('../utils').rmDir
+const rm = require('../utils').rm
 
 const USER = 'https://ruben.verborgh.org/profile/#me'
 
@@ -32,7 +32,8 @@ describe('Auth Proxy', () => {
       // Release back-end server
       nock.cleanAll()
       // Remove created index files
-      rmDir()
+      rm('index.html')
+      rm('index.html.acl')
     })
 
     describe('responding to /server/a', () => {

test/integration/authentication-oidc-test.js

@@ -10,6 +10,7 @@ const localStorage = require('localstorage-memory')
 const URL = require('whatwg-url').URL
 global.URL = URL
 global.URLSearchParams = require('whatwg-url').URLSearchParams
+const { cleanDir } = require('../utils')
 
 const supertest = require('supertest')
 const chai = require('chai')
@@ -81,8 +82,8 @@ describe('Authentication API (OIDC)', () => {
     alicePod.close()
     bobPod.close()
     fs.removeSync(path.join(aliceDbPath, 'oidc/users'))
-    fs.removeSync(path.join(aliceRootPath))
-    fs.removeSync(path.join(bobRootPath))
+    cleanDir(aliceRootPath)
+    cleanDir(bobRootPath)
   })
 
   describe('Login page (GET /login)', () => {

test/integration/capability-discovery-test.js

@@ -1,6 +1,6 @@
 const Solid = require('../../index')
 const path = require('path')
-const fs = require('fs-extra')
+const { cleanDir } = require('../utils')
 const supertest = require('supertest')
 const expect = require('chai').expect
 // In this test we always assume that we are Alice
@@ -48,7 +48,7 @@ describe('API', () => {
 
   after(() => {
     alicePod.close()
-    fs.removeSync(path.join(aliceRootPath))
+    cleanDir(aliceRootPath)
   })
 
   describe('Capability Discovery', () => {

test/integration/errors-oidc-test.js

@@ -1,7 +1,7 @@
 const supertest = require('supertest')
 const ldnode = require('../../index')
 const path = require('path')
-const fs = require('fs-extra')
+const { cleanDir } = require('../utils')
 const expect = require('chai').expect
 
 describe('OIDC error handling', function () {
@@ -30,7 +30,7 @@ describe('OIDC error handling', function () {
 
   after(function () {
     if (ldpHttpsServer) ldpHttpsServer.close()
-    fs.removeSync(path.join(rootPath))
+    cleanDir(rootPath)
   })
 
   const server = supertest(serverUri)

test/integration/params-test.js

@@ -1,12 +1,8 @@
 var assert = require('chai').assert
 var supertest = require('supertest')
 var path = require('path')
-const fs = require('fs-extra')
 // Helper functions for the FS
-var rm = require('../utils').rm
-var write = require('../utils').write
-// var cp = require('./utils').cp
-var read = require('../utils').read
+const { rm, write, read, cleanDir } = require('../utils')
 
 var ldnode = require('../../index')
 
@@ -127,7 +123,7 @@ describe('LDNODE params', function () {
 
     after(function () {
       if (ldpHttpsServer) ldpHttpsServer.close()
-      fs.removeSync(path.join(rootPath))
+      cleanDir(rootPath)
     })
 
     var server = supertest(serverUri)

test/utils.js

@@ -1,5 +1,4 @@
-var fs = require('fs')
-var fsExtra = require('fs-extra')
+var fs = require('fs-extra')
 var rimraf = require('rimraf')
 var path = require('path')
 const OIDCProvider = require('@solid/oidc-op')
@@ -11,16 +10,22 @@ exports.rm = function (file) {
   return rimraf.sync(path.join(__dirname, '/resources/' + file))
 }
 
-exports.rmDir = function (path = '') {
-  return rimraf.sync(path.join(__dirname, '/resources/' + path))
+exports.cleanDir = function (dirPath) {
+  fs.removeSync(path.join(dirPath, '.well-known/.acl'))
+  fs.removeSync(path.join(dirPath, 'favicon.ico'))
+  fs.removeSync(path.join(dirPath, 'favicon.ico.acl'))
+  fs.removeSync(path.join(dirPath, 'index.html'))
+  fs.removeSync(path.join(dirPath, 'index.html.acl'))
+  fs.removeSync(path.join(dirPath, 'robots.txt'))
+  fs.removeSync(path.join(dirPath, 'robots.txt.acl'))
 }
 
 exports.write = function (text, file) {
   return fs.writeFileSync(path.join(__dirname, '/resources/' + file), text)
 }
 
 exports.cp = function (src, dest) {
-  return fsExtra.copySync(
+  return fs.copySync(
     path.join(__dirname, '/resources/' + src),
     path.join(__dirname, '/resources/' + dest))
 }