Adding test for Patch

But no actual implementation in patch handler yet

Author: megoth

test/integration/validate-tts.js

@@ -10,50 +10,35 @@ const server = setupSuperServer({
   webid: false
 })
 
-describe('Validate HTTP requests with Turtle syntax', function () {
-  describe('PUT API', function () {
-    const putRequestBody = fs.readFileSync(path.join(__dirname, '../resources/sampleContainer/invalid.ttl'), {
-      'encoding': 'utf8'
+const invalidTurtleBody = fs.readFileSync(path.join(__dirname, '../resources/invalid1.ttl'), {
+  'encoding': 'utf8'
+})
+
+describe('HTTP requests with invalid Turtle syntax', () => {
+  describe('PUT API', () => {
+    it('should return 400', (done) => {
+      server.put('/should-not-be-created.ttl')
+        .send(invalidTurtleBody)
+        .set('content-type', 'text/turtle')
+        .expect(400, done)
     })
-    it('should return 400', function (done) {
-      server.put('/put-resource-1.ttl')
-        .send(putRequestBody)
+  })
+
+  describe.skip('PATCH API', () => {
+    it('should return 400', (done) => { // TODO: This returns 415 right now
+      server.patch('/patch-1-initial.ttl')
+        .send(invalidTurtleBody)
         .set('content-type', 'text/turtle')
         .expect(400, done)
     })
   })
 
-  // describe('POST (multipart)', function () {
-  //   it('should create as many files as the ones passed in multipart',
-  //     function (done) {
-  //       server.post('/sampleContainer/')
-  //         .attach('timbl', path.join(__dirname, '../resources/timbl.jpg'))
-  //         .attach('nicola', path.join(__dirname, '../resources/nicola.jpg'))
-  //         .expect(200)
-  //         .end(function (err) {
-  //           if (err) return done(err)
-  //
-  //           var sizeNicola = fs.statSync(path.join(__dirname,
-  //             '../resources/nicola.jpg')).size
-  //           var sizeTim = fs.statSync(path.join(__dirname, '../resources/timbl.jpg')).size
-  //           var sizeNicolaLocal = fs.statSync(path.join(__dirname,
-  //             '../resources/sampleContainer/nicola.jpg')).size
-  //           var sizeTimLocal = fs.statSync(path.join(__dirname,
-  //             '../resources/sampleContainer/timbl.jpg')).size
-  //
-  //           if (sizeNicola === sizeNicolaLocal && sizeTim === sizeTimLocal) {
-  //             return done()
-  //           } else {
-  //             return done(new Error('Either the size (remote/local) don\'t match or files are not stored'))
-  //           }
-  //         })
-  //     })
-  //   after(function () {
-  //     // Clean up after POST (multipart) API tests
-  //     return Promise.all([
-  //       rm('/sampleContainer/nicola.jpg'),
-  //       rm('/sampleContainer/timbl.jpg')
-  //     ])
-  //   })
-  // })
+  describe.skip('POST API (multipart)', () => { // TODO: Is this something we should validate?
+    it('should create as many files as the ones passed in multipart', (done) => {
+      server.post('/')
+        .attach('timbl', path.join(__dirname, '../resources/invalid1.ttl'))
+        .attach('nicola', path.join(__dirname, '../resources/invalid2.ttl'))
+        .expect(400, done)
+    })
+  })
 })

…st/resources/sampleContainer/invalid.ttl test/resources/invalid1.ttltest/resources/sampleContainer/invalid.ttl renamed to test/resources/invalid1.ttl test/resources/sampleContainer/invalid.ttl renamed to test/resources/invalid1.ttl

@@ -0,0 +1,9 @@
+@prefix txn: <http://example.org/data/transaction/> .
+@prefix srv: <http://example.org/data/server/> .
+@prefix log: <http://example.org/ont/transaction-log/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+txn:123 invalid log:Transaction ;
+	log:processedBy srv:A ;
+	log:processedAt "2015-10-16T10:22:23"^^xsd:dateTime ;
+	log:statusCode 200 .

test/resources/invalid2.ttl

@@ -93,41 +93,3 @@ 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)
-      })
-  })
-}