Removing the need to run tests in order

Author: megoth

test/integration/acl-tls-test.js

@@ -231,7 +231,7 @@ describe('ACL with WebID+TLS', function () {
           done()
         })
       })
-      it("should create test file's acl file", function (done) {
+      it('should create test file\'s acl file', function (done) {
         var options = createOptions('/acl-tls/write-acl/test-file.acl', 'user1')
         options.headers = {
           'content-type': 'text/turtle'
@@ -243,7 +243,7 @@ describe('ACL with WebID+TLS', function () {
           done()
         })
       })
-      it("should not access test file's acl file", function (done) {
+      it('should not access test file\'s acl file', function (done) {
         var options = createOptions('/acl-tls/write-acl/test-file.acl', 'user1')
         options.headers = {
           accept: 'text/turtle'
@@ -267,12 +267,10 @@ describe('ACL with WebID+TLS', function () {
   })
 
   describe('Origin', function () {
-    before(function () {
+    before(function (done) {
       rm('acl-tls/origin/test-folder/.acl')
-    })
 
-    it('should PUT new ACL file', function (done) {
-      var options = createOptions('/acl-tls/origin/test-folder/.acl', 'user1', 'text/turtle')
+      const options = createOptions('/acl-tls/origin/test-folder/.acl', 'user1', 'text/turtle')
       options.headers = {
         'content-type': 'text/turtle'
       }
@@ -294,6 +292,7 @@ describe('ACL with WebID+TLS', function () {
         // TODO user header
       })
     })
+
     it('user1 should be able to access test directory', function (done) {
       var options = createOptions('/acl-tls/origin/test-folder/', 'user1')
       options.headers.origin = origin1
@@ -365,11 +364,9 @@ describe('ACL with WebID+TLS', function () {
   })
 
   describe('Mixed statement Origin', function () {
-    before(function () {
+    before(function (done) {
       rm('acl-tls/origin/test-folder/.acl')
-    })
 
-    it('should PUT new ACL file', function (done) {
       var options = createOptions('/acl-tls/origin/test-folder/.acl', 'user1', 'text/turtle')
       options.headers = {
         'content-type': 'text/turtle'
@@ -379,9 +376,9 @@ describe('ACL with WebID+TLS', function () {
         ' <http://www.w3.org/ns/auth/acl#agent> <' + user1 + '>;\n' +
         ' <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control> .\n' +
         '<#Owner2> a <http://www.w3.org/ns/auth/acl#Authorization>;\n' +
-          ' <http://www.w3.org/ns/auth/acl#accessTo> <https://localhost:3456/test/acl-tls/origin/test-folder/>;\n' +
-          ' <http://www.w3.org/ns/auth/acl#origin> <' + origin1 + '>;\n' +
-          ' <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control> .\n' +
+        ' <http://www.w3.org/ns/auth/acl#accessTo> <https://localhost:3456/test/acl-tls/origin/test-folder/>;\n' +
+        ' <http://www.w3.org/ns/auth/acl#origin> <' + origin1 + '>;\n' +
+        ' <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>, <http://www.w3.org/ns/auth/acl#Control> .\n' +
         '<#Public> a <http://www.w3.org/ns/auth/acl#Authorization>;\n' +
         ' <http://www.w3.org/ns/auth/acl#accessTo> <./>;\n' +
         ' <http://www.w3.org/ns/auth/acl#agentClass> <http://www.w3.org/ns/auth/acl#AuthenticatedAgent>;\n' +
@@ -395,6 +392,7 @@ describe('ACL with WebID+TLS', function () {
         // TODO user header
       })
     })
+
     it('user1 should be able to access test directory', function (done) {
       var options = createOptions('/acl-tls/origin/test-folder/', 'user1')
       options.headers.origin = origin1
@@ -582,7 +580,7 @@ describe('ACL with WebID+TLS', function () {
 
   describe('Append-only', function () {
     // var body = fs.readFileSync(__dirname + '/resources/acl-tls/append-acl/abc.ttl.acl')
-    it("user1 should be able to access test file's ACL file", function (done) {
+    it('user1 should be able to access test file\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/append-acl/abc.ttl.acl', 'user1')
       request.head(options, function (error, response) {
         assert.equal(error, null)
@@ -623,7 +621,7 @@ describe('ACL with WebID+TLS', function () {
         done()
       })
     })
-    it("user2 should not be able to access test file's ACL file", function (done) {
+    it('user2 should not be able to access test file\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/append-acl/abc.ttl.acl', 'user2')
       request.head(options, function (error, response, body) {
         assert.equal(error, null)
@@ -685,7 +683,7 @@ describe('ACL with WebID+TLS', function () {
       ' <http://www.w3.org/ns/auth/acl#accessTo> <./abc2.ttl>;\n' +
       ' <http://www.w3.org/ns/auth/acl#agent> <' + user2 + '>;\n' +
       ' <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read>, <http://www.w3.org/ns/auth/acl#Write>.\n'
-    it("user1 should be able to modify test file's ACL file", function (done) {
+    it('user1 should be able to modify test file\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/append-acl/abc2.ttl.acl', 'user1')
       options.headers = {
         'content-type': 'text/turtle'
@@ -697,7 +695,7 @@ describe('ACL with WebID+TLS', function () {
         done()
       })
     })
-    it("user1 should be able to access test file's ACL file", function (done) {
+    it('user1 should be able to access test file\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/append-acl/abc2.ttl.acl', 'user1')
       request.head(options, function (error, response, body) {
         assert.equal(error, null)
@@ -733,7 +731,7 @@ describe('ACL with WebID+TLS', function () {
         done()
       })
     })
-    it("user2 should not be able to access test file's ACL file", function (done) {
+    it('user2 should not be able to access test file\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/append-acl/abc2.ttl.acl', 'user2')
       request.head(options, function (error, response, body) {
         assert.equal(error, null)
@@ -791,7 +789,7 @@ describe('ACL with WebID+TLS', function () {
       ' <http://www.w3.org/ns/auth/acl#default> <./>;\n' +
       ' <http://www.w3.org/ns/auth/acl#agentClass> <http://xmlns.com/foaf/0.1/Agent>;\n' +
       ' <http://www.w3.org/ns/auth/acl#mode> <http://www.w3.org/ns/auth/acl#Read> .\n'
-    it("user1 should be able to modify test directory's ACL file", function (done) {
+    it('user1 should be able to modify test directory\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/write-acl/default-for-new/.acl', 'user1')
       options.headers = {
         'content-type': 'text/turtle'
@@ -803,7 +801,7 @@ describe('ACL with WebID+TLS', function () {
         done()
       })
     })
-    it("user1 should be able to access test direcotory's ACL file", function (done) {
+    it('user1 should be able to access test direcotory\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/write-acl/default-for-new/.acl', 'user1')
       request.head(options, function (error, response, body) {
         assert.equal(error, null)
@@ -831,7 +829,7 @@ describe('ACL with WebID+TLS', function () {
         done()
       })
     })
-    it("user2 should not be able to access test direcotory's ACL file", function (done) {
+    it('user2 should not be able to access test direcotory\'s ACL file', function (done) {
       var options = createOptions('/acl-tls/write-acl/default-for-new/.acl', 'user2')
       request.head(options, function (error, response, body) {
         assert.equal(error, null)