summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2013-11-18 16:06:12 -0800
committerdanielsdeleo <dan@opscode.com>2013-11-18 16:06:12 -0800
commitdee38bd613de3284106dc3758447878e5f9bfaef (patch)
tree5db3956a8dc2a22e625be59b4296918073022026
parentc3373e49b5d983e93dde4fd3000e27cf3232f1c8 (diff)
downloadchef-zero-configure-rspec-opts.tar.gz
Allow custom server options in rspec helper moduleconfigure-rspec-opts
-rw-r--r--lib/chef_zero/rspec.rb13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/chef_zero/rspec.rb b/lib/chef_zero/rspec.rb
index bb883f0..f6fca10 100644
--- a/lib/chef_zero/rspec.rb
+++ b/lib/chef_zero/rspec.rb
@@ -26,9 +26,20 @@ module ChefZero
def when_the_chef_server(description, *tags, &block)
context "When the Chef server #{description}", *tags do
before :each do
+
unless ChefZero::RSpec.server
+ default_opts = {:port => 8889, :signals => false, :log_requests => true}
+ server_opts = if self.respond_to?(:chef_zero_opts)
+ default_opts.merge(chef_zero_opts)
+ else
+ default_opts
+ end
+
+ # TODO: can this be logged easily?
+ # pp :zero_opts => server_opts
+
# Set up configuration so that clients will point to the server
- ChefZero::RSpec.server = ChefZero::Server.new(:port => 8889, :signals => false, :log_requests => true)
+ ChefZero::RSpec.server = ChefZero::Server.new(server_opts)
ChefZero::RSpec.client_key = Tempfile.new(['chef_zero_client_key', '.pem'])
ChefZero::RSpec.client_key.write(ChefZero::PRIVATE_KEY)
ChefZero::RSpec.client_key.close