Make sure SSL options are passed through

Author: stianeikeland

package.json

@@ -40,7 +40,8 @@
     "coffee-script": "^1.9.1",
     "mocha": "^2.1.0",
     "nock": "^2.17.0",
-    "should": "^5.0.1"
+    "should": "^5.0.1",
+    "simple-mock": "^0.5.0"
   },
   "keywords": [
     "etcd",

src/client.coffee

@@ -93,7 +93,7 @@ class Client
         headers: headers
     callback = syncRespHandler if options.synchronous is true
 
-    req = request options, reqRespHandler
+    req = @_doRequest options, reqRespHandler
     token.setRequest req
 
     if options.synchronous is true and options.syncdone is undefined
@@ -105,6 +105,10 @@ class Client
       return req
 
 
+  _doRequest: (options, reqRespHandler) ->
+    request options, reqRespHandler
+
+
   _retry: (token, options, callback) =>
     doRetry = () =>
       @_multiserverHelper token.servers, options, token, callback

src/index.coffee

@@ -9,20 +9,7 @@ class Etcd
 
   # Constructor, set etcd host and port.
   # For https: provide {ca, crt, key} as sslopts.
-  # constructor: (host = '127.0.0.1', port = null, sslopts = null, client = null) ->
-
-  #   if _.isArray(host)
-  #     @hosts = host
-  #     @sslopts = port
-  #     @client = sslopts
-  #   else
-  #     port ?= 4001
-  #     @hosts = ["#{host}:#{port}"]
-  #     @sslopts = sslopts
-  #     @client = client
-
-  #   @client ?= new Client(@hosts, @sslopts)
-
+  # constructor: (hosts = ["http://127.0.0.1:4001"], options = {}) ->
   constructor: (hosts = "127.0.0.1:4001", options = {}) ->
     @hosts = @_cleanHostList hosts
     @client = new Client(@hosts, options, null)

test/index.coffee

@@ -1,7 +1,10 @@
 should = require 'should'
 nock = require 'nock'
+simple = require 'simple-mock'
 Etcd = require '../src/index.coffee'
 
+
+
 # Set env var to skip timeouts
 process.env.RUNNING_UNIT_TESTS = true
 
@@ -330,25 +333,19 @@ describe 'Basic functions', ->
 
 describe 'SSL support', ->
 
-  it 'should use https url if sslopts is given', ->
-    etcdssl = new Etcd 'localhost', '4001', {}
-    opt = etcdssl._prepareOpts 'path'
-    opt.serverprotocol.should.equal "https"
-
-  it 'should set ca if ca is given', ->
-    etcdsslca = new Etcd 'localhost', '4001', {ca: ['ca']}
-    opt = etcdsslca._prepareOpts 'path'
-    should.exist opt.agentOptions
-    should.exist opt.agentOptions.ca
-    opt.agentOptions.ca.should.eql ['ca']
+  beforeEach () ->
+    nock.cleanAll()
 
-  it 'should connect to https if sslopts is given', (done) ->
-    getNock('https://localhost:4001')
-      .get('/v2/keys/key')
-      .reply(200, '{"action":"GET","key":"/key","value":"value","index":1}')
+  it 'passes ssl options to request lib', (done) ->
+    etcdssl = new Etcd 'https://localhost:4009', {ca: 'myca', cert: 'mycert', key: 'mykey'}
+    simple.mock(etcdssl.client, "_doRequest").callFn (options) ->
+      options.should.containEql
+        ca: 'myca'
+        cert: 'mycert'
+        key: 'mykey'
+      done()
 
-    etcdssl = new Etcd ['localhost:4001'], {ca: ['ca']}
-    etcdssl.get 'key', done
+    etcdssl.get 'key'
 
 
 describe 'Cancellation Token', ->