Clean up SPARQL UPDATE PATCH tests.

Author: RubenVerborgh

test/integration/patch-2.js test/integration/patch-sparql-update.jstest/integration/patch-2.js renamed to test/integration/patch-sparql-update.js

@@ -1,3 +1,5 @@
+// Integration tests for PATCH with application/sparql-update
+
 var ldnode = require('../../index')
 var supertest = require('supertest')
 var assert = require('chai').assert
@@ -6,10 +8,9 @@ var path = require('path')
 // Helper functions for the FS
 var rm = require('../test-utils').rm
 var write = require('../test-utils').write
-// var cp = require('./test-utils').cp
 var read = require('../test-utils').read
 
-describe('PATCH', function () {
+describe('PATCH through application/sparql-update', function () {
   // Starting LDP
   var ldp = ldnode({
     root: path.join(__dirname, '../resources/sampleContainer'),
@@ -18,52 +19,41 @@ describe('PATCH', function () {
   })
   var server = supertest(ldp)
 
-  it.skip('..................', function (done) {
+  it('should create a new file if file does not exist', function (done) {
     rm('sampleContainer/notExisting.ttl')
     server.patch('/notExisting.ttl')
       .set('content-type', 'application/sparql-update')
       .send('INSERT DATA { :test  :hello 456 .}')
       .expect(200)
       .end(function (err, res, body) {
-        if (err) {
-          done(err)
-        }
-        console.log('@@@@ ' + read('sampleContainer/notExisting.ttl'))
         assert.equal(
-          read('sampleContainer/notExisting.ttl'), ''
-        )
+          read('sampleContainer/notExisting.ttl'),
+          '@prefix : </notExisting.ttl#>.\n\n:test :hello 456 .\n\n')
         rm('sampleContainer/notExisting.ttl')
         done(err)
       })
   })
 
   describe('DELETE', function () {
-    it('reproduce index 1 bug from pad', function (done) {
-      var expected = `@prefix : </existingTriple.ttl#>.
-@prefix dc: <http://purl.org/dc/elements/1.1/>.
-@prefix c: <https://www.w3.org/People/Berners-Lee/card#>.
-@prefix n: <http://rdfs.org/sioc/ns#>.
-@prefix p: <http://www.w3.org/ns/pim/pad#>.
-@prefix ic: <http://www.w3.org/2002/12/cal/ical#>.
-@prefix XML: <http://www.w3.org/2001/XMLSchema#>.
-@prefix flow: <http://www.w3.org/2005/01/wf/flow#>.
-@prefix ui: <http://www.w3.org/ns/ui#>.
-@prefix ind: </parent/index.ttl#>.
-@prefix mee: <http://www.w3.org/ns/pim/meeting#>.
-
-:id1477502276660 dc:author c:i; n:content ""; p:next :this.
-
-:id1477522707481
-    ic:dtstart "2016-10-26T22:58:27Z"^^XML:dateTime;
-    flow:participant c:i;
-    ui:backgroundColor "#c1d0c8".
-:this
-    a p:Notepad;
-    dc:author c:i;
-    dc:created "2016-10-25T15:44:42Z"^^XML:dateTime;
-    dc:title "Shared Notes";
-    p:next :id1477502276660.
-ind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n`
+    it('should be an empty resource if last triple is deleted', function (done) {
+      write(
+        '<#current> <#temp> 123 .',
+        'sampleContainer/existingTriple.ttl')
+      server.post('/existingTriple.ttl')
+        .set('content-type', 'application/sparql-update')
+        .send('DELETE { :current  :temp 123 .}')
+        .expect(200)
+        .end(function (err, res, body) {
+          assert.equal(
+            read('sampleContainer/existingTriple.ttl'),
+            '@prefix : </existingTriple.ttl#>.\n\n')
+          rm('sampleContainer/existingTriple.ttl')
+          done(err)
+        })
+    })
+
+    it('should delete a single triple from a pad document', function (done) {
+      var expected = '@prefix : </existingTriple.ttl#>.\n@prefix dc: <http://purl.org/dc/elements/1.1/>.\n@prefix c: <https://www.w3.org/People/Berners-Lee/card#>.\n@prefix n: <http://rdfs.org/sioc/ns#>.\n@prefix p: <http://www.w3.org/ns/pim/pad#>.\n@prefix ic: <http://www.w3.org/2002/12/cal/ical#>.\n@prefix XML: <http://www.w3.org/2001/XMLSchema#>.\n@prefix flow: <http://www.w3.org/2005/01/wf/flow#>.\n@prefix ui: <http://www.w3.org/ns/ui#>.\n@prefix ind: </parent/index.ttl#>.\n@prefix mee: <http://www.w3.org/ns/pim/meeting#>.\n\n:id1477502276660 dc:author c:i; n:content ""; p:next :this.\n\n:id1477522707481\n    ic:dtstart "2016-10-26T22:58:27Z"^^XML:dateTime;\n    flow:participant c:i;\n    ui:backgroundColor "#c1d0c8".\n:this\n    a p:Notepad;\n    dc:author c:i;\n    dc:created "2016-10-25T15:44:42Z"^^XML:dateTime;\n    dc:title "Shared Notes";\n    p:next :id1477502276660.\nind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n'
 
       write(`\n\
 
@@ -114,7 +104,9 @@ ind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n`
   })
 
   describe('DELETE and INSERT', function () {
-    it('should be update a resource using SPARQL-query using `prefix`', function (done) {
+    after(() => rm('sampleContainer/prefixSparql.ttl'))
+
+    it('should update a resource using SPARQL-query using `prefix`', function (done) {
       write(
         '@prefix schema: <http://schema.org/> .\n' +
         '@prefix profile: <http://ogp.me/ns/profile#> .\n' +
@@ -134,11 +126,7 @@ ind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n`
         .end(function (err, res, body) {
           assert.equal(
             read('sampleContainer/prefixSparql.ttl'),
-            '@prefix : </prefixSparql.ttl#>.\n' +
-            '@prefix schema: <http://schema.org/>.\n' +
-            '@prefix pro: <http://ogp.me/ns/profile#>.\n\n' +
-            ': a schema:Person; pro:first_name "Timothy".\n\n')
-          rm('sampleContainer/prefixSparql.ttl')
+            '@prefix : </prefixSparql.ttl#>.\n@prefix schema: <http://schema.org/>.\n@prefix pro: <http://ogp.me/ns/profile#>.\n\n: a schema:Person; pro:first_name "Timothy".\n\n')
           done(err)
         })
     })
@@ -156,9 +144,7 @@ ind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n`
         .end(function (err, res, body) {
           assert.equal(
             read('sampleContainer/addingTriple.ttl'),
-            '@prefix : </addingTriple.ttl#>.\n\n' +
-            ':current :temp 123 .\n\n' +
-            ':test :hello 456 .\n\n')
+            '@prefix : </addingTriple.ttl#>.\n\n:current :temp 123 .\n\n:test :hello 456 .\n\n')
           rm('sampleContainer/addingTriple.ttl')
           done(err)
         })
@@ -175,8 +161,7 @@ ind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n`
         .end(function (err, res, body) {
           assert.equal(
             read('sampleContainer/addingTripleValue.ttl'),
-            '@prefix : </addingTripleValue.ttl#>.\n\n' +
-            ':current :temp 123, 456 .\n\n')
+            '@prefix : </addingTripleValue.ttl#>.\n\n:current :temp 123, 456 .\n\n')
           rm('sampleContainer/addingTripleValue.ttl')
           done(err)
         })
@@ -193,8 +178,7 @@ ind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n`
         .end(function (err, res, body) {
           assert.equal(
             read('sampleContainer/addingTripleSubj.ttl'),
-            '@prefix : </addingTripleSubj.ttl#>.\n\n' +
-            ':current :temp 123; :temp2 456 .\n\n')
+            '@prefix : </addingTripleSubj.ttl#>.\n\n:current :temp 123; :temp2 456 .\n\n')
           rm('sampleContainer/addingTripleSubj.ttl')
           done(err)
         })
@@ -212,8 +196,7 @@ ind:this flow:participation :id1477522707481; mee:sharedNotes :this.\n\n`
       .end(function (err, res, body) {
         assert.equal(
           read('sampleContainer/emptyExample.ttl'),
-          '@prefix : </emptyExample.ttl#>.\n\n' +
-          ':current :temp 123 .\n\n')
+          '@prefix : </emptyExample.ttl#>.\n\n:current :temp 123 .\n\n')
         rm('sampleContainer/emptyExample.ttl')
         done(err)
       })