can now pass in own http server

napcs · Jul 6, 2012 · b53e2c4 · b53e2c4
1 parent f670f58
commit b53e2c4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/lib/livereload.coffee b/lib/livereload.coffee
@@ -109,7 +109,7 @@ exports.createServer = (config) ->
       res.writeHead(200, {'Content-Type': 'text/javascript'})
       res.end fs.readFileSync __dirname + '/../ext/livereload.js'
 
-  config.server = app
+  config.server ?= app
 
   server = new Server config
   server.listen()

diff --git a/lib/livereload.js b/lib/livereload.js
diff --git a/test/index.test.coffee b/test/index.test.coffee
@@ -17,3 +17,19 @@ describe 'livereload http file servingt', ->
 			server.config.server.close()
 
 			done()
+  it 'should allow you to override the internal http server', (done) ->
+    app = http.createServer (req, res) ->
+      if url.parse(req.url).pathname is '/livereload.js'
+        res.writeHead(200, {'Content-Type': 'text/javascript'})
+        res.end '// nothing to see here'
+
+    server = livereload.createServer({port: 35729, server: app})
+
+    request 'http://localhost:35729/livereload.js?snipver=1', (error, response, body) ->
+      should.not.exist error
+      response.statusCode.should.equal 200
+      body.should.equal '// nothing to see here'
+
+      server.config.server.close()
+
+      done()