adding scenario folders

nicola · nicola · commit 99bc4841f956 · 2016-05-12T09:31:42.000-04:00
diff --git a/test/accounts.js b/test/accounts.js
@@ -3,11 +3,10 @@ const parallel = require('run-parallel')
 const waterfall = require('run-waterfall')
 const path = require('path')
 const supertest = require('supertest')
-
 // In this test we always assume that we are Alice
 
 function getBobFoo (alice, bob, done) {
-  bob.get('/')
+  bob.get('/foo')
     .expect(401)
     .end(done)
 }
@@ -26,22 +25,32 @@ describe('OIDC flow', () => {
   let alice
   let bob
 
-  const solid = Solid.createServer({
-    root: path.join(__dirname, '/resources'),
+  const alicePod = Solid.createServer({
+    root: path.join(__dirname, '/resources/accounts-scenario/alice'),
+    sslKey: path.join(__dirname, '/keys/key.pem'),
+    sslCert: path.join(__dirname, '/keys/cert.pem'),
+    auth: 'oidc',
+    dataBrowser: false,
+    fileBrowser: false
+  })
+  const bobPod = Solid.createServer({
+    root: path.join(__dirname, '/resources/accounts-scenario/bob'),
     sslKey: path.join(__dirname, '/keys/key.pem'),
     sslCert: path.join(__dirname, '/keys/cert.pem'),
-    webid: true
+    auth: 'oidc',
+    dataBrowser: false,
+    fileBrowser: false
   })
 
   before(function (done) {
     parallel([
       (cb) => {
-        aliceServer = solid.listen(3456, cb)
-        alice = supertest('https://localhost:3456')
+        aliceServer = alicePod.listen(5000, cb)
+        alice = supertest('https://localhost:5000')
       },
       (cb) => {
-        bobServer = solid.listen(3457, cb)
-        bob = supertest('https://localhost:3457')
+        bobServer = bobPod.listen(5001, cb)
+        bob = supertest('https://localhost:5001')
       }
     ], done)
   })
diff --git a/test/resources/accounts-scenario/alice/.acl b/test/resources/accounts-scenario/alice/.acl
@@ -0,0 +1,5 @@
+<#Owner>
+ a <http://www.w3.org/ns/auth/acl#Authorization> ;
+ <http://www.w3.org/ns/auth/acl#accessTo> <./>;
+ <http://www.w3.org/ns/auth/acl#agent> <https://127.0.0.1:5000/profile/card#me>;
+ <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> .
diff --git a/test/resources/accounts-scenario/bob/.acl b/test/resources/accounts-scenario/bob/.acl
@@ -0,0 +1,5 @@
+<#Owner>
+ a <http://www.w3.org/ns/auth/acl#Authorization> ;
+ <http://www.w3.org/ns/auth/acl#accessTo> <./>;
+ <http://www.w3.org/ns/auth/acl#agent> <https://127.0.0.1:5001/profile/card#me>;
+ <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> .
diff --git a/test/resources/accounts-scenario/bob/foo b/test/resources/accounts-scenario/bob/foo
@@ -0,0 +1 @@
+foo
diff --git a/test/resources/accounts-scenario/bob/foo.acl b/test/resources/accounts-scenario/bob/foo.acl
@@ -0,0 +1,5 @@
+<#Alice>
+ a <http://www.w3.org/ns/auth/acl#Authorization> ;
+ <http://www.w3.org/ns/auth/acl#accessTo> <./foo>;
+ <http://www.w3.org/ns/auth/acl#agent> <https://127.0.0.1:5000/profile/card#me>;
+ <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> .
