if password is passed rename it to auth_pass

This commit is contained in:
Henry Oswald 2014-09-29 11:40:40 +01:00
parent a33f537cb1
commit 8f31ac60ca
3 changed files with 28 additions and 7 deletions

View file

@ -3,7 +3,9 @@ _ = require("underscore")
module.exports =
createClient: (opts)->
if opts.password?
opts.auth_pass = opts.password
delete opts.password
if opts.endpoints?
standardOpts = _.clone(opts)
delete standardOpts.endpoints

View file

@ -1,6 +1,6 @@
{
"name": "redis-sharelatex",
"version": "0.0.2",
"version": "0.0.3",
"description": "redis wrapper for node which will either use sentinal or normal redis",
"main": "index.coffee",
"author": "henry oswald @ sharelatex",

View file

@ -22,14 +22,14 @@ describe "index", ->
"redis-sentinel":@sentinel
"redis":@normalRedis
@auth_pass = "1234 pass"
describe "sentinel", ->
beforeEach ->
@endpoints = [
@endpoints = [
{host: '127.0.0.1', port: 26379},
{host: '127.0.0.1', port: 26380}
]
describe "sentinel", ->
beforeEach ->
@masterName = "my master"
@sentinelOptions =
endpoints:@endpoints
@ -67,5 +67,24 @@ describe "index", ->
describe "setting the password", ->
beforeEach ->
@standardOpts =
password: @auth_pass
port: 1234
host: "redis.mysite.env"
@sentinelOptions =
endpoints:@endpoints
masterName:@masterName
password: @auth_pass
it "should set the auth_pass from password if password exists for normal redis", ->
client = @redis.createClient @standardOpts
@normalRedis.createClient.calledWith(@standardOpts.port, @standardOpts.host, auth_pass:@auth_pass).should.equal true
it "should set the auth_pass from password if password exists for sentinal", ->
client = @redis.createClient @sentinelOptions
@sentinel.createClient.calledWith(@endpoints, @masterName, auth_pass:@auth_pass).should.equal true