Merge pull request #1129 from JulianKniephoff/bugfix/1128-make_dropbox_correctly_fetch_folders

Make Dropbox correctly fetch folders

Author: galfert

src/dropbox.js

@@ -375,6 +375,11 @@ Dropbox.prototype = {
     var url = 'https://content.dropboxapi.com/2/files/download';
     var self = this;
 
+    //use _getFolder for folders
+    if (path.substr(-1) === '/') {
+      return this._getFolder(path, options);
+    }
+
     var savedRev = this._revCache.get(path);
     if (savedRev === null) {
       // file was deleted server side
@@ -386,11 +391,6 @@ Dropbox.prototype = {
       return Promise.resolve({statusCode: 304});
     }
 
-    //use _getFolder for folders
-    if (path.substr(-1) === '/') {
-      return this._getFolder(path, options);
-    }
-
     var params = {
       headers: {
         'Dropbox-API-Arg': JSON.stringify({path: getDropboxPath(path)})

test/unit/dropbox-suite.js

@@ -623,6 +623,38 @@ define(['require', './src/util', './src/dropbox', './src/wireclient',
           }
         },
 
+        {
+          desc: "#get correctly recognizes changes in folders",
+          run: function (env, test) {
+            env.connectedClient.get('/').then(function (r) {
+              env.connectedClient.get('/', { ifNoneMatch: r.revision }).then(function (r) {
+                test.assertFail(r.statusCode, 304);
+              });
+              var req = XMLHttpRequest.instances.shift();
+              test.assertFail(req, undefined);
+              req.status = 200;
+              req.responseText = JSON.stringify({
+                entries: [{
+                  '.tag': 'file',
+                  path_lower: 'foo',
+                  rev: '2'
+                }]
+              });
+              req._onload();
+            });
+            var req = XMLHttpRequest.instances.shift();
+            req.status = 200;
+            req.responseText = JSON.stringify({
+              entries: [{
+                '.tag': 'file',
+                path_lower: 'foo',
+                rev: '1'
+              }]
+            });
+            req._onload();
+          }
+        },
+
         {
           desc: "#put causes the revision to propagate down in revCache",
           run: function (env, test) {