From bafce7665fd01540ca92a151d1a60411a446a0cd Mon Sep 17 00:00:00 2001 From: Mirco Zeiss Date: Fri, 3 Jul 2015 13:50:20 +0200 Subject: [PATCH] update dependencies --- Makefile | 12 ++++++++++++ package.json | 16 +++++++--------- test/test.js | 27 ++++++++++++++------------- 3 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4509f0d --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ + +BIN = ./node_modules/.bin +MOCHA = $(BIN)/mocha +ESLINT = $(BIN)/eslint + +test: + $(MOCHA) + +eslint: index.js ./test/*.js + $(ESLINT) $^ + +.PHONY: test eslint diff --git a/package.json b/package.json index 4cc6a94..976f051 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/zeMirco/lockit-mongodb-adapter" + "url": "https://github.com/zemirco/lockit-mongodb-adapter" }, "keywords": [ "lockit", @@ -18,21 +18,19 @@ "author": { "name": "Mirco Zeiss", "email": "mirco.zeiss@gmail.com", - "twitter": "zeMirco" + "twitter": "zemirco" }, "license": "MIT", "dependencies": { - "node-uuid": "~1.4.1", - "ms": "~0.6.2", "couch-pwd": "0.0.1", "moment": "^2.6.0", - "mongodb": "^1.4.5" + "mongodb": "^2.0.35", + "ms": "^0.7.1", + "node-uuid": "~1.4.1" }, "devDependencies": { "eslint": "^0.24.0", - "grunt": "^0.4.5", - "grunt-contrib-jshint": "^0.10.0", - "grunt-mocha-test": "^0.10.2", - "should": "^3.3.1" + "mocha": "^2.2.5", + "should": "^7.0.1" } } diff --git a/test/test.js b/test/test.js index e748fd7..4d55f63 100644 --- a/test/test.js +++ b/test/test.js @@ -1,3 +1,4 @@ +'use strict'; var should = require('should'); var config = require('./config.js'); @@ -20,7 +21,7 @@ describe('lockit-mongodb-adapter', function() { it('should create a new user', function(done) { adapter.save('john', 'john@email.com', 'secret', function(err, res) { - if (err) console.log(err); + if (err) {console.log(err); } res.should.have.property('signupToken'); res.signupToken.should.match(/[0-9a-f]{22}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/); res.should.have.property('failedLoginAttempts'); @@ -33,7 +34,7 @@ describe('lockit-mongodb-adapter', function() { it('should find a user by name', function(done) { adapter.find('name', 'john', function(err, res) { - if (err) console.log(err); + if (err) {console.log(err); } res.name.should.equal('john'); res.email.should.equal('john@email.com'); done(); @@ -42,7 +43,7 @@ describe('lockit-mongodb-adapter', function() { it('should return undefined when no user is found', function(done) { adapter.find('name', 'jim', function(err, res) { - if (err) console.log(err); + if (err) {console.log(err); } should.not.exist(err); should.not.exist(res); done(); @@ -51,7 +52,7 @@ describe('lockit-mongodb-adapter', function() { it('should find a user by email', function(done) { adapter.find('email', 'john@email.com', function(err, res) { - if (err) console.log(err); + if (err) {console.log(err); } res.name.should.equal('john'); res.email.should.equal('john@email.com'); done(); @@ -60,7 +61,7 @@ describe('lockit-mongodb-adapter', function() { it('should find a user by signup token', function(done) { adapter.find('signupToken', _tmp_signupToken, function(err, res) { - if (err) console.log(err); + if (err) {console.log(err); } res.name.should.equal('john'); res.email.should.equal('john@email.com'); done(); @@ -69,11 +70,11 @@ describe('lockit-mongodb-adapter', function() { it('should update an existing user', function(done) { adapter.find('name', 'john', function(err, doc) { - if (err) console.log(err); + if (err) {console.log(err); } doc.test = 'works'; doc.editet = true; - adapter.update(doc, function(err, res) { - if (err) console.log(err); + adapter.update(doc, function(updateErr, res) { + if (updateErr) {console.log(updateErr); } res.test.should.equal('works'); res.editet.should.be.true; done(); @@ -82,10 +83,10 @@ describe('lockit-mongodb-adapter', function() { }); it('should remove a user', function(done) { - adapter.save('jeff', 'jeff@email.com', 'secret', function(err, res) { - if (err) console.log(err); - adapter.remove('jeff', function(err, res) { - if (err) console.log(err); + adapter.save('jeff', 'jeff@email.com', 'secret', function(err) { + if (err) {console.log(err); } + adapter.remove('jeff', function(removeErr, res) { + if (removeErr) {console.log(removeErr); } res.should.be.true; done(); }); @@ -93,7 +94,7 @@ describe('lockit-mongodb-adapter', function() { }); it('should return an error when remove cannot find a user', function(done) { - adapter.remove('steve', function(err, res) { + adapter.remove('steve', function(err) { err.message.should.equal('lockit - Cannot find user "steve"'); done(); });