Merge pull request #62 from tschaub/overwrite

Test cases for same src and dest.
tschaub · Oct 21, 2014 · 0b874c6 · 0b874c6
2 parents 4e7869d + 6716df9
commit 0b874c6
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 10 deletions.
diff --git a/lib/util.js b/lib/util.js
@@ -97,16 +97,6 @@ var filterFilesByTime = exports.filterFilesByTime = function(files, previous,
           // dest file not yet created, use all src files
           return done(null, obj);
         }
-        if (obj.src && obj.src.length === 1 && obj.src[0] === obj.dest) {
-          // when src and dest are same, compare to previous
-          return filterPathsByTime(obj.src, previous, override,
-              function(err, src) {
-                if (err) {
-                  return done(err);
-                }
-                done(null, {src: src, dest: obj.dest});
-              });
-        }
         return anyNewer(obj.src, stats.mtime, override, function(err, any) {
           done(err, any && obj);
         });

diff --git a/test/lib/util.spec.js b/test/lib/util.spec.js
@@ -259,6 +259,57 @@ describe('util', function() {
     });
     afterEach(mock.restore);
 
+    it('compares to previous time if src & dest are same (a)', function(done) {
+      var files = [{
+        src: ['src/js/a.js'],
+        dest: 'src/js/a.js'
+      }];
+      util.filterFilesByTime(files, new Date(50), nullOverride,
+          function(err, results) {
+        assert.isNull(err);
+        assert.equal(results.length, 1);
+        var result = results[0];
+        assert.equal(result.dest, 'src/js/a.js');
+        assert.deepEqual(result.src, files[0].src);
+        done();
+      });
+    });
+
+    it('compares to previous time if src & dest are same (b)', function(done) {
+      var files = [{
+        src: ['src/js/a.js'],
+        dest: 'src/js/a.js'
+      }];
+      util.filterFilesByTime(files, new Date(150), nullOverride,
+          function(err, results) {
+        assert.isNull(err);
+        assert.equal(results.length, 0);
+        done();
+      });
+    });
+
+    it('compares to previous time if src & dest are same (c)', function(done) {
+      var files = [{
+        src: ['src/js/a.js'],
+        dest: 'src/js/a.js'
+      }, {
+        src: ['src/js/b.js'],
+        dest: 'src/js/b.js'
+      }];
+      util.filterFilesByTime(files, new Date(50), nullOverride,
+          function(err, results) {
+        assert.isNull(err);
+        assert.equal(results.length, 2);
+        var first = results[0];
+        assert.equal(first.dest, 'src/js/a.js');
+        assert.deepEqual(first.src, files[0].src);
+        var second = results[1];
+        assert.equal(second.dest, 'src/js/b.js');
+        assert.deepEqual(second.src, files[1].src);
+        done();
+      });
+    });
+
     it('provides all files if any is newer than dest', function(done) {
       var files = [{
         src: ['src/js/a.js', 'src/js/b.js', 'src/js/c.js'],