Fix more generated tests due to Karate change (#91)

Author: edwardsph

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Solid Specification Conformance Tests
 
-## Release 0.0.13
+## Release 0.0.14
 * Fix tests where scenarios are generated by a function (due to Karate change)
 
 ## Release 0.0.12

run.sh

@@ -71,6 +71,8 @@ setup_css() {
 }
 EOF
 
+  mkdir -p certs:q
+
   openssl req -new -x509 -days 365 -nodes \
     -out certs/server.cert \
     -keyout certs/server.key \

web-access-control/wac-allow/public-access-direct.feature

@@ -2,33 +2,36 @@
 Feature: The WAC-Allow header shows public access modes for a public agent when given direct access
 
   Background: Create test resources giving a public agent different access modes
-    * table testModes
-      | test | modes | check |
-      | 'read' | ['read'] | 'only' |
-      | 'read/control' | ['read', 'control'] | 'only' |
-      | 'read/write' | ['read', 'write'] | '' |
-      | 'read/append' | ['read', 'append'] | 'only' |
-      | 'read/write/append' | ['read', 'write', 'append'] | 'only' |
-
+    * def modesList = [['read'], ['read', 'control'], ['read', 'write'], ['read', 'append'], ['read', 'write', 'append']]
     * def setup =
     """
       function() {
         const testContainer = rootTestContainer.reserveContainer();
         const resources = {}
-        for (const row of testModes) {
+        for (const modes of modesList) {
           const resource = testContainer.createResource('.ttl', karate.readAsString('../fixtures/example.ttl'), 'text/turtle');
           const access = resource.accessDatasetBuilder
-                .setPublicAccess(resource.url, row.modes)
+                .setPublicAccess(resource.url, modes)
                 .build();
           resource.accessDataset = access;
-          resources[row.test] = resource;
+          resources[modes.join('/')] = resource;
         }
         return resources;
       }
     """
     * def resources = callonce setup
     * def resource = resources['read']
 
+  @setup
+  Scenario: Define test cases
+    * table testModes
+      | test                | modes                       | check  |
+      | 'read'              | ['read']                    | 'only' |
+      | 'read/control'      | ['read', 'control']         | 'only' |
+      | 'read/write'        | ['read', 'write']           | ''     |
+      | 'read/append'       | ['read', 'append']          | 'only' |
+      | 'read/write/append' | ['read', 'write', 'append'] | 'only' |
+
   Scenario: There is an acl on the resource containing a public agent
     Given url resource.aclUrl
     And headers clients.alice.getAuthHeaders('GET', resource.aclUrl)
@@ -74,7 +77,7 @@ Feature: The WAC-Allow header shows public access modes for a public agent when
     # user access is implied by public
     And match result.user contains <check> <modes>
     Examples:
-      | testModes |
+      | karate.setup().testModes |
 
   Scenario Outline: A public user calls HEAD on a resource with <test> access and the header shows <test> access for public
     Given url resources['<test>'].url
@@ -85,4 +88,4 @@ Feature: The WAC-Allow header shows public access modes for a public agent when
     And match result.public contains <check> <modes>
     And match result.user contains <check> <modes>
     Examples:
-      | testModes |
+      | karate.setup().testModes |

web-access-control/wac-allow/public-access-indirect.feature

@@ -2,33 +2,36 @@
 Feature: The WAC-Allow header shows public access modes for a public agent when given indirect access via a container
 
   Background: Create test resources giving a public agent different access modes
-    * table testModes
-      | test | modes | check |
-      | 'read' | ['read'] | 'only' |
-      | 'read/control' | ['read', 'control'] | 'only' |
-      | 'read/write' | ['read', 'write'] | '' |
-      | 'read/append' | ['read', 'append'] | 'only' |
-      | 'read/write/append' | ['read', 'write', 'append'] | 'only' |
-
+    * def modesList = [['read'], ['read', 'control'], ['read', 'write'], ['read', 'append'], ['read', 'write', 'append']]
     * def setup =
     """
       function() {
         const resources = {}
-        for (const row of testModes) {
+        for (const modes of modesList) {
           const testContainer = rootTestContainer.createContainer();
           const access = testContainer.accessDatasetBuilder
-                .setInheritablePublicAccess(testContainer.url, row.modes)
+                .setInheritablePublicAccess(testContainer.url, modes)
                 .build();
           testContainer.accessDataset = access;
           const resource = testContainer.createResource('.ttl', karate.readAsString('../fixtures/example.ttl'), 'text/turtle');
-          resources[row.test] = resource;
+          resources[modes.join('/')] = resource;
         }
         return resources;
       }
     """
     * def resources = callonce setup
     * def resource = resources['read']
 
+  @setup
+  Scenario: Define test cases
+    * table testModes
+      | test                | modes                       | check  |
+      | 'read'              | ['read']                    | 'only' |
+      | 'read/control'      | ['read', 'control']         | 'only' |
+      | 'read/write'        | ['read', 'write']           | ''     |
+      | 'read/append'       | ['read', 'append']          | 'only' |
+      | 'read/write/append' | ['read', 'write', 'append'] | 'only' |
+
   Scenario: There is no acl on the resource that references a public agent
     Given url resource.aclUrl
     And headers clients.alice.getAuthHeaders('GET', resource.aclUrl)
@@ -74,7 +77,7 @@ Feature: The WAC-Allow header shows public access modes for a public agent when
     # user access is implied by public
     And match result.user contains <check> <modes>
     Examples:
-      | testModes |
+      | karate.setup().testModes |
 
   Scenario Outline: A public user calls HEAD on a resource with <test> access and the header shows <test> access for public
     Given url resources['<test>'].url
@@ -85,4 +88,4 @@ Feature: The WAC-Allow header shows public access modes for a public agent when
     And match result.public contains <check> <modes>
     And match result.user contains <check> <modes>
     Examples:
-      | testModes |
+      | karate.setup().testModes |