fix: UT abe user

abecms · Nov 24, 2016 · 66249a7 · 66249a7
1 parent 37dc90f
commit 66249a7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/src/cli/users/operations.js b/src/cli/users/operations.js
@@ -1,9 +1,5 @@
-import fs from 'fs-extra'
-import mkdirp from 'mkdirp'
-
 import {
-  config
-  ,coreUtils
+  coreUtils
   ,User
 } from '../../cli'
 
@@ -104,7 +100,7 @@ export function update(data) {
       })
     }
   }
-  var bdd = User.manager.instance.save(bdd)
+  bdd = User.manager.instance.save(bdd)
 
   return {
     success:1,
@@ -127,7 +123,7 @@ export function updatePassword(data, password) {
     }
   }
 
-  var bdd = User.manager.instance.save(bdd)
+  bdd = User.manager.instance.save(bdd)
 
   return {
     success:1,

diff --git a/src/cli/users/utils.js b/src/cli/users/utils.js
@@ -162,14 +162,13 @@ export function findByResetPasswordToken(resetPasswordToken, done) {
 }
 
 export function isValid(user, password) {
-  var bdd = User.manager.instance.get()
   if(user.actif === 1) {
     if(bcrypt.compareSync(password, user.password)) {
       return true
     }
   }
-  return false;
-};
+  return false
+}
 
 export function decodeUser(req, res) {
   var decoded = {}

diff --git a/src/server/middlewares/isUserAllowed.js b/src/server/middlewares/isUserAllowed.js
@@ -20,7 +20,6 @@ var middleware = function(req, res, next) {
   }
 
   var isHtml = /text\/html/.test(req.get('accept')) ? true : false
-  var isAllowed = true
 
   var decoded = User.utils.decodeUser(req, res)
   var user = User.utils.findSync(decoded.iss)

diff --git a/test/users.js b/test/users.js
@@ -281,8 +281,6 @@ describe('users', function() {
   it('User.utils.isValid', function(){
     // stub
     var sinonInstance = sinon.sandbox.create();
-    var stubGet = sinonInstance.stub(User.manager.instance, 'get');
-    stubGet.returns(JSON.parse(JSON.stringify(this.fixture.users)))
     var stubHashSync = sinonInstance.stub(bcrypt, 'compareSync');
     stubHashSync.returns(true);
 
@@ -291,8 +289,6 @@ describe('users', function() {
     chai.expect(res).to.be.equal(true)
 
     // unstub
-    sinon.assert.calledOnce(User.manager.instance.get)
-    User.manager.instance.get.restore()
     sinon.assert.calledOnce(bcrypt.compareSync)
     bcrypt.compareSync.restore()
   })