summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-12-28 13:57:20 -0800
committerTim Smith <tsmith@chef.io>2017-12-28 14:19:08 -0800
commit498e43cc0a9a5dc38a2bf08105effc9803eccef6 (patch)
tree0b030e594be924e502712f1db2047d0ed2b255d1
parentbfe8487a26f99d3cd3e08fffea8cf6457631cf69 (diff)
downloadchef-http_speedup.tar.gz
Fix splat usage in the create_server methodhttp_speedup
Make it more clear that we're merging extra options with options and passing that all in to create the webrick server Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--spec/tiny_server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/tiny_server.rb b/spec/tiny_server.rb
index 83c5bf4a42..27e573b5b9 100644
--- a/spec/tiny_server.rb
+++ b/spec/tiny_server.rb
@@ -92,7 +92,7 @@ module TinyServer
attr_reader :server_thread
def create_server(**extra_options)
- server = WEBrick::HTTPServer.new(**options, **extra_options)
+ server = WEBrick::HTTPServer.new(options.merge(extra_options))
server.mount("/", Rack::Handler::WEBrick, API.instance)
server
end