summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2013-10-10 15:51:24 -0700
committerJohn Keiser <jkeiser@opscode.com>2013-10-10 15:51:24 -0700
commit21b9ce573f1c6ee9ec934960a844e782e011ba08 (patch)
tree52a212c71a09c75184a14bc60f0778f1cf09fa04 /spec/integration
parent2a214bcff7174b61129a7a8a642b8df5b5f4afee (diff)
downloadchef-21b9ce573f1c6ee9ec934960a844e782e011ba08.tar.gz
Rename -. to -z
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/client/client_spec.rb18
-rw-r--r--spec/integration/knife/common_options_spec.rb8
2 files changed, 13 insertions, 13 deletions
diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index 37b96e12fd..a91c5966a1 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -21,26 +21,26 @@ EOM
it 'should complete with success when cwd is just above cookbooks and paths are not specified' do
chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
- result = shell_out("#{chef_dir}/chef-client -. -o 'x::default'", :cwd => path_to(''))
+ result = shell_out("#{chef_dir}/chef-client -z -o 'x::default'", :cwd => path_to(''))
result.error!
end
it 'should complete with success when cwd is below cookbooks and paths are not specified' do
chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
- result = shell_out("#{chef_dir}/chef-client -. -o 'x::default'", :cwd => path_to('cookbooks/x'))
+ result = shell_out("#{chef_dir}/chef-client -z -o 'x::default'", :cwd => path_to('cookbooks/x'))
result.error!
end
it 'should fail when cwd is below high above and paths are not specified' do
chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
- result = shell_out("#{chef_dir}/chef-client -. -o 'x::default'", :cwd => File.expand_path('..', path_to('')))
+ result = shell_out("#{chef_dir}/chef-client -z -o 'x::default'", :cwd => File.expand_path('..', path_to('')))
result.exitstatus.should == 1
end
- it 'should load .chef/knife.rb when -. is specified' do
+ it 'should load .chef/knife.rb when -z is specified' do
file '.chef/knife.rb', 'xxx.xxx'
chef_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "bin"))
- result = shell_out("#{chef_dir}/chef-client -. -o 'x::default'", :cwd => path_to(''))
+ result = shell_out("#{chef_dir}/chef-client -z -o 'x::default'", :cwd => path_to(''))
result.exitstatus.should == 2
end
@@ -99,14 +99,14 @@ EOM
end
end
- it "should complete with success when passed the -. flag" do
+ it "should complete with success when passed the -z flag" do
file 'config/client.rb', <<EOM
chef_server_url 'http://omg.com/blah'
cookbook_path "#{path_to('cookbooks')}"
EOM
chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
- result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -.", :cwd => chef_dir)
+ result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
result.error!
end
@@ -121,14 +121,14 @@ EOM
result.error!
end
- it "should complete with success when passed -. and --chef-zero-port" do
+ it "should complete with success when passed -z and --chef-zero-port" do
file 'config/client.rb', <<EOM
chef_server_url 'http://omg.com/blah'
cookbook_path "#{path_to('cookbooks')}"
EOM
chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
- result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -.", :cwd => chef_dir)
+ result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
result.error!
end
end
diff --git a/spec/integration/knife/common_options_spec.rb b/spec/integration/knife/common_options_spec.rb
index e9c7e7c102..6de4d9360b 100644
--- a/spec/integration/knife/common_options_spec.rb
+++ b/spec/integration/knife/common_options_spec.rb
@@ -87,16 +87,16 @@ EOM
end
end
- it 'knife raw -. /nodes/x retrieves the role' do
- knife('raw -. /nodes/x').should_succeed /"name": "x"/
+ it 'knife raw -z /nodes/x retrieves the role' do
+ knife('raw -z /nodes/x').should_succeed /"name": "x"/
end
it 'knife raw --local-mode /nodes/x retrieves the role' do
knife('raw --local-mode /nodes/x').should_succeed /"name": "x"/
end
- it 'knife raw -. --chef-zero-port=9999 /nodes/x retrieves the role' do
- knife('raw -. --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
+ it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the role' do
+ knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
Chef::Config.chef_server_url.should == 'http://127.0.0.1:9999'
end
end