tests for ldp.readContainer

nicola · nicola · commit b2e703bc31d8 · 2015-07-28T14:52:08.000+02:00
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -87,11 +87,14 @@ LDP.prototype.readFile = function (filename, callback) {
 };
 
 LDP.prototype.readContainerMeta = function (directory, callback) {
+  if (directory[directory.length-1] !== '/') {
+    directory += '/';
+  }
   fs.readFile(directory + this.suffixMeta, {
     'encoding': 'utf8'
   }, function(err, data) {
     if (err) {
-      data = "";
+      return callback({ status: 404, message:'Metafile not found'});
     }
     return callback(null, data);
   });
@@ -291,15 +294,11 @@ LDP.prototype.get = function(filename, uri, includeBody, callback) {
 
         // Found a container
         if (stats.isDirectory()) {
-            return ldp.readContainerMeta(filename, function(err, data) {
+            return ldp.readContainerMeta(filename, function(err, metaFile) {
                 if (err) {
-                    debug.handlers('GET/HEAD -- Read error:' + err);
-                    return callback({
-                        status: err.status,
-                        message: err.message
-                    });
+                    metaFile = '';
                 }
-                ldp.listContainer(filename, uri, data, function (err, data) {
+                ldp.listContainer(filename, uri, metaFile, function (err, data) {
                     if (err) {
                         debug.handlers('GET/HEAD -- Read error:' + err);
                         return callback({
diff --git a/test/ldp.js b/test/ldp.js
@@ -17,14 +17,46 @@ describe('LDP', function () {
       });
     });
 
+    it ('return file if file exists', function (done) {
+      // file can be empty as well
+      write('hello world', 'fileExists.txt');
+      ldp.readFile(__dirname + '/resources/fileExists.txt', function(err, file) {
+        rm('fileExists.txt');
+        assert.notOk(err);
+        assert.equal(file, 'hello world');
+        done();
+      });
+    });
   });
 
-  describe('LDP', function () {
-
-  });
+  describe('readContainer', function () {
+    it ('should return 404 if .meta is not found', function (done) {
+      ldp.readContainerMeta('resources/', function(err) {
+        assert.equal(err.status, 404);
+        done();
+      });
+    });
 
-  describe('LDP', function () {
+    it ('should return content if metaFile exists', function (done) {
+      // file can be empty as well
+      write('', '.meta');
+      ldp.readContainerMeta(__dirname + '/resources/', function(err, metaFile) {
+        rm('.meta');
+        assert.notOk(err);
+        assert.equal(metaFile, '');
+        done();
+      });
+    });
 
+    it ('should work also if trailing `/` is not passed', function (done) {
+      // file can be empty as well
+      write('', '.meta');
+      ldp.readContainerMeta(__dirname + '/resources', function(err, metaFile) {
+        rm('.meta');
+        assert.notOk(err);
+        assert.equal(metaFile, '');
+        done();
+      });
+    });
   });
-
 });
diff --git a/test/params.js b/test/params.js
@@ -8,7 +8,7 @@ var read = require('./test-utils').read;
 
 var ldnode = require('../index');
 
-describe('params', function () {
+describe('LDNODE params', function () {
 
   describe('suffixMeta', function () {
     describe('not passed', function() {
