Load skin (mashlib) if requesting text/html

deiu · deiu · commit 8a84397e2309 · 2016-03-08T15:28:18.000-05:00
diff --git a/lib/handlers/get.js b/lib/handlers/get.js
@@ -78,9 +78,11 @@ function handler (req, res, next) {
         var address = req.protocol + '/' + req.get('host') + req.originalUrl
         return res.redirect(303, ldp.defaultApp + address)
       }
-      // Serve (pipe) resource as requested
-      res.setHeader('Content-Type', contentType)
-      return stream.pipe(res)
+
+      res.set('Content-Type', 'text/html')
+      var skin = _path.join(__dirname, '../../static/skin.html')
+      res.sendFile(skin)
+      return
     }
 
     // If request accepts the content-type we found
diff --git a/test/http.js b/test/http.js
@@ -208,11 +208,16 @@ describe('HTTP APIs', function () {
         .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
         .expect(200, done)
     })
-    it('should serve the right content type if requested as text/html', function (done) {
+    it('should load skin (mashlib) if resource was requested as text/html', function (done) {
       server.get('/sampleContainer/example1.ttl')
         .set('Accept', 'text/html')
-        .expect('content-type', /text\/turtle/)
-        .expect(200, done)
+        .expect('content-type', /text\/html/)
+        .expect(function (res) {
+          if (res.text.indexOf('TabulatorOutline') < 0) {
+            throw new Error('did not load the Tabulator skin by default')
+          }
+        })
+        .expect(200, done) // Can't check for 303 because of internal redirects
     })
     it('should redirect to defaultApp if container was requested as text/html', function (done) {
       server.get('/sampleContainer/')

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,11 @@ function handler (req, res, next) {`
`78`	`78`	`var address = req.protocol + '/' + req.get('host') + req.originalUrl`
`79`	`79`	`return res.redirect(303, ldp.defaultApp + address)`
`80`	`80`	`}`
`81`		`- // Serve (pipe) resource as requested`
`82`		`- res.setHeader('Content-Type', contentType)`
`83`		`- return stream.pipe(res)`
	`81`	`+`
	`82`	`+ res.set('Content-Type', 'text/html')`
	`83`	`+ var skin = _path.join(__dirname, '../../static/skin.html')`
	`84`	`+ res.sendFile(skin)`
	`85`	`+ return`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`// If request accepts the content-type we found`