Skip to content
This repository has been archived by the owner on May 8, 2021. It is now read-only.

Commit

Permalink
fixed build/tests; updated deps
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholascloud committed May 13, 2016
1 parent 0873221 commit d791ef2
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 31 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
@@ -1,3 +1,4 @@
language: node_js
node_js:
- "0.8"
- "0.12"
- "6"
13 changes: 1 addition & 12 deletions Jakefile.js
Expand Up @@ -8,8 +8,7 @@ var pkg = require('./package.json'),
rimraf = require('rimraf');

var ROOT_DIR = __dirname,
BUILD_DIR = path.join(ROOT_DIR, 'build'),
TEST_DIR = path.join(ROOT_DIR, 'test');
BUILD_DIR = path.join(ROOT_DIR, 'build');

var VERSION_TEMPLATE_VAR = /\{\{VERSION\}\}/g;

Expand Down Expand Up @@ -49,16 +48,6 @@ task('build', ['clean', BUILD_DIR], function () {
});
});

desc('runs unit tests');
task('test', ['build'], function () {
console.log('@@ TEST_DIR', TEST_DIR);

var mochaBin = path.join(ROOT_DIR, 'node_modules', '.bin', 'mocha');
var testCmd = mochaBin + ' ' + TEST_DIR;
jake.exec(testCmd, function () {
}, {printStdout: true});
});

task('default', function () {
console.log('l33teral -- l33t literals for JavaScript');
console.log('To see available tasks:');
Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "l33teral",
"version": "3.0.0",
"version": "3.0.1",
"location": "git://github.com/nicholascloud/l33teral",
"author": "Nicholas Cloud",
"description": "functions to help deal with object literals",
Expand Down
4 changes: 2 additions & 2 deletions build/l33teral-latest.js
@@ -1,5 +1,5 @@
/**
* l33teral 3.0.0
* l33teral 3.0.1
*
* The MIT License (MIT)
*
Expand Down Expand Up @@ -101,7 +101,7 @@
* @constructor
*/
function L33teral(obj) {
this.__version__ = '3.0.0';
this.__version__ = '3.0.1';
this.obj = obj || {};
}

Expand Down
23 changes: 13 additions & 10 deletions package.json
@@ -1,25 +1,28 @@
{
"name": "l33teral",
"version": "3.0.0",
"version": "3.0.1",
"author": "Nicholas Cloud",
"description": "functions to help deal with object literals",
"keywords": ["literals", "objects", "utilities"],
"keywords": [
"literals",
"objects",
"utilities"
],
"repository": {
"type": "git",
"url": "git://github.com/nicholascloud/l33teral"
},
"dependencies": {
},
"dependencies": {},
"devDependencies": {
"async": "0.2.5",
"chai": "1.4.2",
"clone": "0.1.5",
"async": "^2.0.0-rc.4",
"chai": "^3.5.0",
"clone": "^1.0.2",
"jake": "latest",
"mocha": "1.8.1",
"rimraf": "2.1.4"
"mocha": "^2.4.5",
"rimraf": "^2.5.2"
},
"main": "./build/l33teral-latest",
"scripts": {
"test": "./node_modules/.bin/jake test --trace"
"test": "jake build && ./node_modules/.bin/mocha test"
}
}
9 changes: 4 additions & 5 deletions test/l33teral.mocha.js
@@ -1,7 +1,6 @@
/*global describe, it*/
'use strict';
var _ = require('underscore'),
mocha = require('mocha'),
var mocha = require('mocha'),
assert = require('chai').assert,
version = require('../package.json').version,
leet = require('../build/l33teral-latest'),
Expand Down Expand Up @@ -31,15 +30,15 @@ describe('L33teral', function () {
it('should be empty if the constructor argument is null or undefined', function (done) {
var leetMock = leet(null);
assert.isNotNull(leetMock.obj);
assert.isTrue(_.isEmpty(leetMock.obj));
assert.equal(0, Object.keys(leetMock.obj));

leetMock = leet(undefined);
assert.isNotNull(leetMock.obj);
assert.isTrue(_.isEmpty(leetMock.obj));
assert.equal(0, Object.keys(leetMock.obj));

leetMock = leet();
assert.isNotNull(leetMock.obj);
assert.isTrue(_.isEmpty(leetMock.obj));
assert.equal(0, Object.keys(leetMock.obj));

done();
});
Expand Down

0 comments on commit d791ef2

Please sign in to comment.