Merge pull request #1667 from parabuzzle/fix_force_flag

[CHEF-1652] Fix force flag

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/chef/knife/client_delete.rb b/lib/chef/knife/client_delete.rb
index 1902145c8d..d7d302ee1d 100644
--- a/lib/chef/knife/client_delete.rb
+++ b/lib/chef/knife/client_delete.rb
@@ -47,7 +47,7 @@ class Chef
           object = Chef::ApiClient.load(@client_name)
           if object.validator
             unless config[:delete_validators]
-              ui.fatal("You must specify --force to delete the validator client #{@client_name}")
+              ui.fatal("You must specify --delete-validators to delete the validator client #{@client_name}")
               exit 2
             end
           end
diff --git a/spec/unit/knife/client_delete_spec.rb b/spec/unit/knife/client_delete_spec.rb
index 01b49b3d7c..c7908a0934 100644
--- a/spec/unit/knife/client_delete_spec.rb
+++ b/spec/unit/knife/client_delete_spec.rb
@@ -50,7 +50,7 @@ describe Chef::Knife::ClientDelete do
       Chef::ApiClient.should_receive(:load).and_return(@client)
     end
 
-    it 'should delete non-validator client if --force is not set' do
+    it 'should delete non-validator client if --delete-validators is not set' do
       @knife.config[:delete_validators] = false
       @client.should_receive(:destroy).and_return(@client)
       @knife.should_receive(:msg)
@@ -58,7 +58,7 @@ describe Chef::Knife::ClientDelete do
       @knife.run
     end
 
-    it 'should delete non-validator client if --force is set' do
+    it 'should delete non-validator client if --delete-validators is set' do
       @knife.config[:delete_validators] = true
       @client.should_receive(:destroy).and_return(@client)
       @knife.should_receive(:msg)
@@ -66,13 +66,13 @@ describe Chef::Knife::ClientDelete do
       @knife.run
     end
 
-    it 'should not delete validator client if --force is not set' do
+    it 'should not delete validator client if --delete-validators is not set' do
       @client.validator(true)
       @knife.ui.should_receive(:fatal)
       lambda { @knife.run}.should raise_error(SystemExit)
     end
 
-    it 'should delete validator client if --force is set' do
+    it 'should delete validator client if --delete-validators is set' do
       @knife.config[:delete_validators] = true
       @client.should_receive(:destroy).and_return(@client)
       @knife.should_receive(:msg)