Fix missing errors when expect.real([])

kotas · Feb 2, 2014 · c1b4827 · c1b4827
1 parent ebd274b
commit c1b4827
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -45,14 +45,13 @@ function expect(options, expectation) {
   var numTests = 0, numPasses = 0, numFailures = 0;
 
   function eachFile(file, encoding, done) {
-    var originalFile = file;
-
-    numTests++;
-
     // To fix relative path to be based on cwd (where gulpfile.js exists)
+    var originalFile = file;
     file = originalFile.clone();
     file.base = file.cwd;
 
+    numTests++;
+
     var _this = this;
     fileTester.test(file, function (err) {
       if (err && !options.reportUnexpected) {

diff --git a/lib/file-tester.js b/lib/file-tester.js
@@ -14,9 +14,7 @@ module.exports = FileTester;
 
 function FileTester(expectation, options) {
   this.rules = parseExpectation(expectation);
-  if (options && options.checkRealFile) {
-    this.rules.push(new Rule(null, checkFileExists));
-  }
+  this.options = xtend({ checkRealFile: false }, options);
 }
 
 function parseExpectation(expectation) {
@@ -49,6 +47,7 @@ function checkFileExists(file, callback) {
 }
 
 FileTester.prototype.test = function (file, callback) {
+  var _this = this;
   var matchedAny = false;
   async.eachSeries(this.rules, function (rule, next) {
     if (!rule.matchFilePath(file.relative)) {
@@ -57,10 +56,18 @@ FileTester.prototype.test = function (file, callback) {
     matchedAny = true;
     rule.testFile(file, next);
   }, function (err) {
-    if (!err && !matchedAny) {
-      err = new ExpectationError('unexpected');
+    if (err) {
+      return callback(err);
+    }
+    if (!matchedAny) {
+      return callback(new ExpectationError('unexpected'));
+    }
+
+    if (_this.options.checkRealFile) {
+      checkFileExists(file, callback);
+    } else {
+      callback();
     }
-    callback(err);
   });
 };
 

diff --git a/test/file-tester-spec.js b/test/file-tester-spec.js
@@ -52,6 +52,15 @@ describe('FileTester', function () {
     });
   });
 
+  context('with an empty array', function () {
+    var tester = new FileTester([]);
+
+    it('should always fail as unexpected', function (done) {
+      var file = createFile('foo.txt');
+      tester.test(file, done.expectFail('unexpected'));
+    });
+  });
+
   context('with a hash of file name key and true', function () {
     var tester = new FileTester({
       'foo.txt': true,
@@ -154,7 +163,7 @@ describe('FileTester', function () {
     });
 
     it('should fail if the file not exists', function (done) {
-      var tester = new FileTester('notexists.txt', { checkRealFile: true });
+      var tester = new FileTester('nonexists.txt', { checkRealFile: true });
       var file = createFile('nonexists.txt');
       tester.test(file, done.expectFail('not on filesystem'));
     });

diff --git a/test/gulp-plugin-spec.js b/test/gulp-plugin-spec.js
@@ -65,6 +65,23 @@ describe('gulp-expect-file', function () {
     });
   });
 
+  context('with empty array', function () {
+    it('tests no files in stream', function (done) {
+      gutil.log.expect(/PASS/);
+      var stream = expect([]);
+      testStream(stream, done);
+      stream.end();
+    });
+
+    it('fails if any file is in stream', function (done) {
+      gutil.log.expect(/FAIL: foo\.txt is unexpected/);
+      var stream = expect([]);
+      testStream(stream, done);
+      stream.write(createFile('foo.txt'));
+      stream.end();
+    });
+  });
+
   context('with { reportUnexpected: true }', function () {
     it('should report unexpected files', function (done) {
       gutil.log.expect(/FAIL: bar\.txt is unexpected/);
@@ -171,6 +188,13 @@ describe('gulp-expect-file', function () {
       stream.write(createFile('nonexists.txt'));
       stream.end();
     });
+
+    it('passes with no files', function (done) {
+      gutil.log.expect(/PASS/);
+      var stream = expect.real([]);
+      testStream(stream, done);
+      stream.end();
+    });
   });
 
 });