diff options
author | Jamie Winsor <jamie@vialstudios.com> | 2013-05-05 16:01:44 -0700 |
---|---|---|
committer | Jamie Winsor <jamie@vialstudios.com> | 2013-05-05 16:01:44 -0700 |
commit | 5a3304b6e6ae8c9dc4d890f3215cc7ddd9ffddaa (patch) | |
tree | f5221b7a2f4cee956943741c3a8828a70c2acecc /lib/chef_zero/rspec.rb | |
parent | 435c7f28b0f4125f90e8a3189419eb8cfd7f8368 (diff) | |
download | chef-zero-5a3304b6e6ae8c9dc4d890f3215cc7ddd9ffddaa.tar.gz |
remove dependency on Chef::Config
this also removes automatic configuration of the Chef::Config singleton within an RSpec
"when the chef server" contextual block. Since ChefZero isn't just for testing Knife
this should not be a problem.
Diffstat (limited to 'lib/chef_zero/rspec.rb')
-rw-r--r-- | lib/chef_zero/rspec.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/lib/chef_zero/rspec.rb b/lib/chef_zero/rspec.rb index 3eea3fc..c821820 100644 --- a/lib/chef_zero/rspec.rb +++ b/lib/chef_zero/rspec.rb @@ -2,7 +2,6 @@ require 'thin' require 'tempfile' require 'chef_zero/server' require 'chef_zero/rest_request' -require 'chef/config' module ChefZero module RSpec @@ -44,20 +43,6 @@ module ChefZero ChefZero::RSpec.server.clear_data end ChefZero::RSpec.clear_request_log - - @old_chef_server_url = Chef::Config.chef_server_url - @old_node_name = Chef::Config.node_name - @old_client_key = Chef::Config.client_key - Chef::Config.chef_server_url = ChefZero::RSpec.server.url - Chef::Config.node_name = 'admin' - Chef::Config.client_key = ChefZero::RSpec.client_key.path - Chef::Config.http_retry_count = 0 - end - - after :each do - Chef::Config.chef_server_url = @old_chef_server_url - Chef::Config.node_name = @old_node_name - Chef::Config.client_key = @old_client_key end def self.client(name, client) |