Just a minor commit

Author: megoth

lib/ldp-middleware.js

@@ -10,7 +10,7 @@ const del = require('./handlers/delete')
 const patch = require('./handlers/patch')
 const index = require('./handlers/index')
 const copy = require('./handlers/copy')
-const validate = require('./handlers/validate')
+// const validate = require('./handlers/validate')
 
 function LdpMiddleware (corsSettings) {
   const router = express.Router('/')
@@ -24,9 +24,9 @@ function LdpMiddleware (corsSettings) {
 
   router.copy('/*', allow('Write'), copy)
   router.get('/*', index, allow('Read'), header.addPermissions, get)
-  router.post('/*', allow('Append'), validate, post)
-  router.patch('/*', allow('Append'), validate, patch)
-  router.put('/*', allow('Write'), validate, put)
+  router.post('/*', allow('Append'), post)
+  router.patch('/*', allow('Append'), patch)
+  router.put('/*', allow('Write'), put)
   router.delete('/*', allow('Write'), del)
 
   return router

test/utils.js

@@ -1,8 +1,10 @@
-var fs = require('fs-extra')
-var rimraf = require('rimraf')
-var path = require('path')
+const fs = require('fs-extra')
+const rimraf = require('rimraf')
+const path = require('path')
 const OIDCProvider = require('@solid/oidc-op')
 const dns = require('dns')
+const ldnode = require('../index')
+const supertest = require('supertest')
 
 const TEST_HOSTS = ['nic.localhost', 'tim.localhost', 'nicola.localhost']
 
@@ -80,3 +82,52 @@ exports.loadProvider = function loadProvider (configPath) {
       return provider.initializeKeyChain(config.keys)
     })
 }
+
+exports.createServer = createServer
+function createServer (options) {
+  return ldnode.createServer(options)
+}
+
+exports.setupSuperServer = setupSuperServer
+function setupSuperServer (options) {
+  const ldpServer = createServer(options)
+  return supertest(ldpServer)
+}
+
+/**
+ * Creates a new test basic container via an LDP POST
+ *   (located in `test/resources/{containerName}`)
+ * @method createTestContainer
+ * @param server {supertest} An instance of a supertest server
+ * @param containerName {String} Container name used as slug, no leading `/`
+ * @return {Promise} Promise obj, for use with Mocha's `before()` etc
+ */
+exports.createTestContainer = function createTestContainer (server, containerName) {
+  return new Promise(function (resolve, reject) {
+    server.post('/')
+      .set('content-type', 'text/turtle')
+      .set('slug', containerName)
+      .set('link', '<http://www.w3.org/ns/ldp#BasicContainer>; rel="type"')
+      .set('content-type', 'text/turtle')
+      .end(function (error, res) {
+        error ? reject(error) : resolve(res)
+      })
+  })
+}
+
+/**
+ * Creates a new turtle test resource via an LDP PUT
+ *   (located in `test/resources/{resourceName}`)
+ * @method createTestResource
+ * @param resourceName {String} Resource name (should have a leading `/`)
+ * @return {Promise} Promise obj, for use with Mocha's `before()` etc
+ */
+exports.createTestResource = function createTestResource (server, resourceName) {
+  return new Promise(function (resolve, reject) {
+    server.put(resourceName)
+      .set('content-type', 'text/turtle')
+      .end(function (error, res) {
+        error ? reject(error) : resolve(res)
+      })
+  })
+}