Skip to content
This repository has been archived by the owner on Jul 16, 2020. It is now read-only.

Commit

Permalink
Merge pull request #6 from dominykas/update-deps
Browse files Browse the repository at this point in the history 
Fixing failing tests; updating deps to latest
  • Loading branch information
@dominykas
dominykas committed Nov 9, 2015
2 parents 2b01786 + 44e8e2e commit a27f655
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 101 deletions.
8 changes: 8 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
language: node_js
sudo: false
node_js:
- "0.10"
- "0.12"
- "4"
- "5"
before_install:
- npm i -g npm
67 changes: 37 additions & 30 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,41 @@
{
"name": "multi-glob",
"version": "0.4.0",
"description": "Small wrapper around the glob module that allows globbing for multiple patterns at once",
"homepage": "http://busterjs.org/docs/modules/multi-glob",
"author": "Christian Johansen",
"contributors": [{
"name": "Christian Johansen",
"email": "christian@cjohansen.no",
"url": "http://cjohansen.no"
}, {
"name": "Stein Magnus Jodal",
"email": "stein.magnus@jodal.no",
"url": "http://jodal.no"
}],
"license": "BSD-3-Clause",
"main": "./lib/multi-glob",
"repository": {
"type": "git",
"url": "https://github.com/busterjs/multi-glob.git"
"name": "multi-glob",
"version": "0.4.0",
"description": "Small wrapper around the glob module that allows globbing for multiple patterns at once",
"homepage": "http://busterjs.org/docs/modules/multi-glob",
"author": "Christian Johansen",
"contributors": [
{
"name": "Christian Johansen",
"email": "christian@cjohansen.no",
"url": "http://cjohansen.no"
},
"scripts": {
"test": "node node_modules/buster/bin/buster-test",
"test-debug": "node --debug-brk node_modules/buster/bin/buster-test"
},
"dependencies": {
"glob": ">=3.1.9",
"async": ">=0.1.22",
"lodash": "~1.0"
},
"devDependencies": {
"buster": "*"
{
"name": "Stein Magnus Jodal",
"email": "stein.magnus@jodal.no",
"url": "http://jodal.no"
}
],
"license": "BSD-3-Clause",
"main": "./lib/multi-glob",
"repository": {
"type": "git",
"url": "https://github.com/busterjs/multi-glob.git"
},
"scripts": {
"test": "node node_modules/buster/bin/buster-test",
"test-debug": "node --debug-brk node_modules/buster/bin/buster-test"
},
"engines": {
"node": ">= 4"
},
"dependencies": {
"glob": "5.x",
"async": "1.x",
"lodash": "3.x"
},
"devDependencies": {
"buster": "*",
"proxyquire": "1.x"
}
}
126 changes: 55 additions & 71 deletions test/multi-glob-test.js
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1,98 @@
var buster = require("buster");
var async = require("async");
var _ = require("lodash");
var glob = {};
var vm = require("vm");
var fs = require("fs");

var proxyquire = require("proxyquire");
var assert = buster.referee.assert;

var sandbox = {
buster: buster,
require: function (name) {
if (name === "async") { return async; }
if (name === "lodash") { return _; }
return function () {
return glob.glob.apply(glob, arguments);
};
},
module: {}
};

var lib = require("path").join(__dirname, "../lib/multi-glob.js");
var code = fs.readFileSync(lib, "utf-8");
vm.runInNewContext(code, sandbox);
var g = sandbox.module.exports;

buster.testCase("Multi-glob", {
setUp: function () {
glob.glob = this.stub();
"setUp": function () {
this.nodeGlobStub = this.stub();
this.multiGlob = proxyquire("../lib/multi-glob.js", {
glob: this.nodeGlobStub
});
},

"calls glob with pattern": function () {
g.glob("lib/buster.js");
this.multiGlob.glob("lib/buster.js");

assert.calledOnceWith(glob.glob, "lib/buster.js");
assert.calledOnceWith(this.nodeGlobStub, "lib/buster.js");
},

"calls glob with provided options": function () {
var args = { silent: true };
g.glob("lib/buster.js", args);
this.multiGlob.glob("lib/buster.js", args);

assert.calledOnceWith(glob.glob, "lib/buster.js", args);
assert.calledOnceWith(this.nodeGlobStub, "lib/buster.js", args);
},

"calls glob with empty options when none are provided": function () {
g.glob("lib/buster.js");
this.multiGlob.glob("lib/buster.js");

assert.equals(glob.glob.args[0].length, 3);
assert.isFunction(glob.glob.args[0][2]);
assert.equals(this.nodeGlobStub.args[0].length, 3);
assert.isFunction(this.nodeGlobStub.args[0][2]);
},

"calls glob once with each pattern": function () {
g.glob(["lib/buster.js", "src/buster.js"]);
this.multiGlob.glob(["lib/buster.js", "src/buster.js"]);

assert.calledTwice(glob.glob);
assert.calledWith(glob.glob, "lib/buster.js");
assert.calledWith(glob.glob, "src/buster.js");
assert.calledTwice(this.nodeGlobStub);
assert.calledWith(this.nodeGlobStub, "lib/buster.js");
assert.calledWith(this.nodeGlobStub, "src/buster.js");
},

"calls callback with result from glob": function () {
"calls callback with result from glob": function (done) {
var callback = this.spy();
glob.glob.yields(null, ["lib/buster.js"]);
this.nodeGlobStub.yields(null, ["lib/buster.js"]);

g.glob("lib/buster.js", callback);

assert.calledOnceWith(callback, undefined, ["lib/buster.js"]);
this.multiGlob.glob("lib/buster.js", function (err, res) {
assert.isNull(err);
assert.equals(res, ["lib/buster.js"]);
done();
});
},

"calls callback with combined results from glob": function () {
var callback = this.spy();
glob.glob.withArgs("lib/buster.js").yields(null, ["lib/buster.js"]);
"calls callback with combined results from glob": function (done) {
this.nodeGlobStub.withArgs("lib/buster.js").yields(null, ["lib/buster.js"]);
var files = ["src/buster.js", "src/stuff.js"];
glob.glob.withArgs("src/*.js").yields(null, files);

g.glob(["lib/buster.js", "src/*.js"], callback);
this.nodeGlobStub.withArgs("src/*.js").yields(null, files);

assert.calledWith(callback, undefined,
["lib/buster.js", "src/buster.js", "src/stuff.js"]);
this.multiGlob.glob(["lib/buster.js", "src/*.js"], function (err, res) {
assert.isNull(err);
assert.equals(res, ["lib/buster.js", "src/buster.js", "src/stuff.js"]);
done();
});
},

"calls callback once with glob error": function () {
var callback = this.spy();
glob.glob.withArgs("lib/buster.js").yields({ message: "Oh no" });
"calls callback once with glob error": function (done) {
this.nodeGlobStub.withArgs("lib/buster.js").yields({ message: "Oh no" });
var files = ["src/buster.js", "src/stuff.js"];
glob.glob.withArgs("src/*.js").yields(null, files);

g.glob(["lib/buster.js", "src/*.js"], callback);
this.nodeGlobStub.withArgs("src/*.js").yields(null, files);

assert.calledWith(callback, { message: "Oh no" });
this.multiGlob.glob(["lib/buster.js", "src/*.js"], function (err) {
assert.equals(err, { message: "Oh no" });
done();
});
},

"ignore duplicated items from glob": function () {
var callback = this.spy();
glob.glob.withArgs("src/foo.js").yields(null, ["src/foo.js"]);
"ignore duplicated items from glob": function (done) {
this.nodeGlobStub.withArgs("src/foo.js").yields(null, ["src/foo.js"]);
var files = ["src/foo.js", "src/bar.js"];
glob.glob.withArgs("src/*.js").yields(null, files);
this.nodeGlobStub.withArgs("src/*.js").yields(null, files);

g.glob(["src/foo.js", "src/*.js"], callback);

assert.calledWith(callback, undefined, ["src/foo.js", "src/bar.js"]);
this.multiGlob.glob(["src/foo.js", "src/*.js"], function (err, res) {
assert.isNull(err);
assert.equals(res, ["src/foo.js", "src/bar.js"]);
done();
});
},

"strict": {
"fails on glob that matches no patterns": function () {
var callback = this.spy();
glob.glob.withArgs("src/foo.js").yields(null, []);

g.glob(["src/foo.js"], { strict: true }, callback);

assert.match(callback.args[0][0], {
message: "'src/foo.js' matched no files"
"fails on glob that matches no patterns": function (done) {
this.nodeGlobStub.withArgs("src/foo.js").yields(null, []);

this.multiGlob.glob(["src/foo.js"], { strict: true }, function (err) {
assert.match(err, {
message: "'src/foo.js' matched no files"
});
done()
});
}
}
Expand Down

0 comments on commit a27f655

Please sign in to comment.