From a6c600fa48515ac1058efd6082c72015524d9969 Mon Sep 17 00:00:00 2001
From: Fletcher Nichol <fnichol@nichol.ca>
Date: Fri, 12 Sep 2014 17:04:09 -0600
Subject: [PATCH] Update failing specs around Chef::Config across versions of
 Chef.

---
 lib/chef/knife/server_bootstrap_base.rb             | 4 ++--
 spec/chef/knife/server_bootstrap_ec2_spec.rb        | 4 ++--
 spec/chef/knife/server_bootstrap_linode_spec.rb     | 4 ++--
 spec/chef/knife/server_bootstrap_openstack_spec.rb  | 8 +++++++-
 spec/chef/knife/server_bootstrap_standalone_spec.rb | 4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/chef/knife/server_bootstrap_base.rb b/lib/chef/knife/server_bootstrap_base.rb
index 849cb1f..27d8d86 100644
--- a/lib/chef/knife/server_bootstrap_base.rb
+++ b/lib/chef/knife/server_bootstrap_base.rb
@@ -107,11 +107,11 @@ def validate!
             "the setup instructions at http://fnichol.github.io/knife-server/"
 
         # rubocop:disable Style/DeprecatedHashMethods
-        if !Chef::Config.has_key?(:node_name)
+        if Chef::Config[:node_name].nil?
           ui.error knife_fail.gsub(/{{KEY}}/, "node_name")
           exit 1
         end
-        if !Chef::Config.has_key?(:client_key)
+        if Chef::Config[:client_key].nil?
           ui.error knife_fail.gsub(/{{KEY}}/, "client_key")
           exit 1
         end
diff --git a/spec/chef/knife/server_bootstrap_ec2_spec.rb b/spec/chef/knife/server_bootstrap_ec2_spec.rb
index cfbab7a..a138961 100644
--- a/spec/chef/knife/server_bootstrap_ec2_spec.rb
+++ b/spec/chef/knife/server_bootstrap_ec2_spec.rb
@@ -251,13 +251,13 @@
     let(:credentials)     { double.as_null_object }
 
     it "exits if Chef::Config[:node_name] is missing" do
-      Chef::Config.delete(:node_name)
+      Chef::Config[:node_name] = nil
 
       expect { @knife.run }.to raise_error SystemExit
     end
 
     it "exits if Chef::Config[:client_key] is missing" do
-      Chef::Config.delete(:client_key)
+      Chef::Config[:client_key] = nil
 
       expect { @knife.run }.to raise_error SystemExit
     end
diff --git a/spec/chef/knife/server_bootstrap_linode_spec.rb b/spec/chef/knife/server_bootstrap_linode_spec.rb
index b4e0290..4965a4b 100644
--- a/spec/chef/knife/server_bootstrap_linode_spec.rb
+++ b/spec/chef/knife/server_bootstrap_linode_spec.rb
@@ -226,13 +226,13 @@
     let(:credentials) { double.as_null_object }
 
     it "exits if Chef::Config[:node_name] is missing" do
-      Chef::Config.delete(:node_name)
+      Chef::Config[:node_name] = nil
 
       expect { @knife.run }.to raise_error SystemExit
     end
 
     it "exits if Chef::Config[:client_key] is missing" do
-      Chef::Config.delete(:client_key)
+      Chef::Config[:client_key] = nil
 
       expect { @knife.run }.to raise_error SystemExit
     end
diff --git a/spec/chef/knife/server_bootstrap_openstack_spec.rb b/spec/chef/knife/server_bootstrap_openstack_spec.rb
index 4a4f83e..811c34b 100644
--- a/spec/chef/knife/server_bootstrap_openstack_spec.rb
+++ b/spec/chef/knife/server_bootstrap_openstack_spec.rb
@@ -228,8 +228,14 @@
     let(:ssh)         { double }
     let(:credentials) { double.as_null_object }
 
+    it "exits if Chef::Config[:node_name] is missing" do
+      Chef::Config[:node_name] = nil
+
+      expect { @knife.run }.to raise_error SystemExit
+    end
+
     it "exits if Chef::Config[:client_key] is missing" do
-      Chef::Config.delete(:client_key)
+      Chef::Config[:client_key] = nil
 
       expect { @knife.run }.to raise_error SystemExit
     end
diff --git a/spec/chef/knife/server_bootstrap_standalone_spec.rb b/spec/chef/knife/server_bootstrap_standalone_spec.rb
index b92360f..2fdeb7f 100644
--- a/spec/chef/knife/server_bootstrap_standalone_spec.rb
+++ b/spec/chef/knife/server_bootstrap_standalone_spec.rb
@@ -242,13 +242,13 @@
     let(:credentials) { double.as_null_object }
 
     it "exits if Chef::Config[:node_name] is missing" do
-      Chef::Config.delete(:node_name)
+      Chef::Config[:node_name] = nil
 
       expect { @knife.run }.to raise_error SystemExit
     end
 
     it "exits if Chef::Config[:client_key] is missing" do
-      Chef::Config.delete(:client_key)
+      Chef::Config[:client_key] = nil
 
       expect { @knife.run }.to raise_error SystemExit
     end