Skip to content

Commit

Permalink
Fix using assert.include (#252)
Browse files Browse the repository at this point in the history
Stopped dependency on `lodash`
  • Loading branch information
abetomo authored and DeviaVir committed Apr 29, 2017
1 parent dba654e commit 1eccb57
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 29 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"aws-sdk-mock": "^1.6.1",
"chai": "^2.0.0",
"hoek": "^2.11.1",
"lodash": "^4.17.4",
"mocha": "",
"should": ""
},
Expand Down
49 changes: 21 additions & 28 deletions test/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ var program = require('commander');
var fs = require('fs-extra');
var Hoek = require('hoek');
var lambda = require(path.join(__dirname, '..', 'lib', 'main'));
var _ = require('lodash');
var zip = require('node-zip');
var rimraf = require('rimraf');

Expand Down Expand Up @@ -279,10 +278,7 @@ describe('node-lambda', function () {

lambda._npmInstall(program, codeDirectory, function (err, result) {
var contents = fs.readdirSync(codeDirectory);

result = _.includes(contents, 'node_modules');
assert.equal(result, true);

assert.include(contents, 'node_modules');
done();
});
});
Expand Down Expand Up @@ -364,12 +360,10 @@ describe('node-lambda', function () {

lambda._zip(program, codeDirectory, function (err, data) {
var archive = new zip(data);
var contents = _.map(archive.files, function (f) {
return f.name.toString();
var contents = Object.keys(archive.files).map(function (k) {
return archive.files[k].name.toString();
});
var result = _.includes(contents, 'index.js');
assert.equal(result, true);

assert.include(contents, 'index.js');
done();
});
});
Expand All @@ -381,13 +375,11 @@ describe('node-lambda', function () {

lambda._archive(program, function (err, data) {
var archive = new zip(data);
var contents = _.map(archive.files, function (f) {
return f.name.toString();
var contents = Object.keys(archive.files).map(function (k) {
return archive.files[k].name.toString();
});
var result = _.includes(contents, 'index.js');
assert.equal(result, true);
result = _.includes(contents, path.join('node_modules', 'async', 'lib', 'async.js'));
assert.equal(result, true);
assert.include(contents, 'index.js');
assert.include(contents, path.join('node_modules', 'async', 'lib', 'async.js'));
done();
});
});
Expand All @@ -408,13 +400,16 @@ describe('node-lambda', function () {
program.prebuiltDirectory = buildDir;
lambda._archive(program, function (err, data) {
var archive = new zip(data);
var contents = _.map(archive.files, function (f) {
return f.name.toString();
var contents = Object.keys(archive.files).map(function (k) {
return archive.files[k].name.toString();
});
[
'testa',
path.join('d', 'testb'),
path.join('node_modules', 'a')
].forEach(function (needle) {
assert.include(contents, needle, `Target: "${needle}"`);
});
var result = _.includes(contents, 'testa') &&
_.includes(contents, path.join('d', 'testb')) &&
_.includes(contents, path.join('node_modules', 'a'));
assert.equal(result, true);
done();
});
});
Expand Down Expand Up @@ -474,13 +469,11 @@ describe('node-lambda', function () {
lambda._archive(_program, function (err, data) {
// same test as "installs and zips with an index.js file and node_modules/async"
var archive = new zip(data);
var contents = _.map(archive.files, function (f) {
return f.name.toString();
var contents = Object.keys(archive.files).map(function (k) {
return archive.files[k].name.toString();
});
var result = _.includes(contents, 'index.js');
assert.equal(result, true);
result = _.includes(contents, path.join('node_modules', 'async', 'lib', 'async.js'));
assert.equal(result, true);
assert.include(contents, 'index.js');
assert.include(contents, path.join('node_modules', 'async', 'lib', 'async.js'));
done();
});
});
Expand Down

0 comments on commit 1eccb57

Please sign in to comment.