Fix Windows CI

Author: UltCombo

index.js

@@ -27,15 +27,15 @@ function normalizeGlobs(globs) {
 	return globs;
 }
 
-module.exports = function (globs, opts, cb) {
+function watch(globs, opts, cb) {
 	globs = normalizeGlobs(globs);
 
 	if (typeof opts === 'function') {
 		cb = opts;
 		opts = {};
 	}
 
-	opts = assign({}, opts);
+	opts = assign({}, watch._defaultOptions, opts);
 	cb = cb || function () {};
 
 	function resolveFilepath(filepath) {
@@ -57,14 +57,6 @@ module.exports = function (globs, opts, cb) {
 	}
 	globs = globs.map(resolveGlob);
 
-	opts.events = opts.events || ['add', 'change', 'unlink'];
-
-	if (opts.ignoreInitial === undefined) {
-		opts.ignoreInitial = true;
-	}
-
-	opts.readDelay = opts.readDelay || 10;
-
 	var baseForced = Boolean(opts.base);
 	var outputStream = new Duplex({objectMode: true, allowHalfOpen: true});
 
@@ -164,4 +156,16 @@ module.exports = function (globs, opts, cb) {
 	}
 
 	return outputStream;
+}
+
+// This is not part of the public API as that would lead to global state (singleton) pollution,
+// and allow unexpected interference between unrelated modules that make use of gulp-watch.
+// This can be useful for unit tests and root application configuration, though.
+// Avoid modifying gulp-watch's default options inside a library/reusable package, please.
+watch._defaultOptions = {
+	events: ['add', 'change', 'unlink'],
+	ignoreInitial: true,
+	readDelay: 10
 };
+
+module.exports = watch;

package.json

@@ -9,9 +9,9 @@
     "gulpplugin"
   ],
   "scripts": {
-    "test": "xo && mocha -R spec test/test-*",
-    "coverage": "istanbul cover node_modules/.bin/_mocha --report html -- -R spec",
-    "coveralls": "istanbul cover _mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage"
+    "test": "xo && mocha -r test/util/set-default-options -R spec test/test-*",
+    "coverage": "istanbul cover node_modules/.bin/_mocha --report html -- -r test/util/set-default-options -R spec",
+    "coveralls": "istanbul cover _mocha --report lcovonly -- -r test/util/set-default-options -R spec && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage"
   },
   "files": [
     "index.js"

test/test-api.js

@@ -23,7 +23,7 @@ describe('api', function () {
 		});
 
 		it('should emit added file', function (done) {
-			w = watch(fixtures('*/*.js'));
+			w = watch(fixtures('folder'));
 			w.add(fixtures('*.js'));
 			w.on('data', function (file) {
 				file.relative.should.eql('new.js');

test/test-base.js

@@ -2,7 +2,6 @@
 
 var watch = require('..');
 var path = require('path');
-var rimraf = require('rimraf');
 var touch = require('./touch.js');
 require('should');
 
@@ -14,7 +13,6 @@ describe('base', function () {
 	var w;
 
 	afterEach(function (done) {
-		rimraf.sync(fixtures('newDir'));
 		w.on('end', done);
 		w.close();
 	});

test/test-callback.js

@@ -15,8 +15,10 @@ describe('callback', function () {
 	var w;
 
 	afterEach(function (done) {
-		rimraf.sync(fixtures('newDir'));
-		w.on('end', done);
+		w.on('end', function () {
+			rimraf.sync(fixtures('newDir'));
+			done();
+		});
 		w.close();
 	});
 
@@ -37,8 +39,6 @@ describe('callback', function () {
 	});
 
 	it('should be called on add event in new directory', function (done) {
-		rimraf.sync(fixtures('newDir'));
-
 		w = watch(fixtures('**/*.ts'), function (file) {
 			file.relative.should.eql(path.normalize('newDir/index.ts'));
 			done();

test/test-cwd.js

@@ -2,7 +2,6 @@
 
 var watch = require('..');
 var path = require('path');
-var rimraf = require('rimraf');
 var touch = require('./touch.js');
 require('should');
 
@@ -14,7 +13,6 @@ describe('cwd', function () {
 	var w;
 
 	afterEach(function (done) {
-		rimraf.sync(fixtures('newDir'));
 		w.on('end', done);
 		w.close();
 	});

test/test-dir.js

@@ -15,8 +15,10 @@ describe('dir', function () {
 	var w;
 
 	afterEach(function (done) {
-		rimraf.sync(fixtures('newDir'));
-		w.on('end', done);
+		w.on('end', function () {
+			rimraf.sync(fixtures('newDir'));
+			done();
+		});
 		w.close();
 	});
 

test/test-ignore.js

@@ -1,4 +1,4 @@
-/* global describe, it, before, after */
+/* global describe, it, afterEach */
 
 var watch = require('..');
 var join = require('path').join;
@@ -14,13 +14,17 @@ function fixtures(glob) {
 describe('ignore', function () {
 	var w;
 
-	before(function () {
-		rimraf.sync(fixtures('temp'));
+	afterEach(function (done) {
+		w.on('end', function () {
+			rimraf.sync(fixtures('temp'));
+			done();
+		});
+		w.close();
 	});
 
-	it('should ignore non-existent folders', function (done) {
+	it('should ignore files', function (done) {
 		w = watch([fixtures('**/*.ts'), '!**/*.js'], function () {
-			done('Ignored folder was watched');
+			done('Ignored file was watched');
 		});
 
 		w.on('ready', function () {
@@ -29,8 +33,4 @@ describe('ignore', function () {
 			setTimeout(done, 200);
 		});
 	});
-
-	after(function () {
-		rimraf.sync(fixtures('temp'));
-	});
 });

test/util/set-default-options.js

@@ -0,0 +1,7 @@
+'use strict';
+
+var watch = require('../..');
+
+if (process.platform === 'win32') {
+	watch._defaultOptions.ignorePermissionErrors = true;
+}