diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-13 11:44:32 -0800 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-01-13 11:44:32 -0800 |
commit | af4afcc712d24dbc85a9c020a124acadeed295d2 (patch) | |
tree | 08a71e81175177fee945d09bb831d5ae37a24606 /spec/integration | |
parent | 1edd3dba71b4531bb1a570dd7e387620e8ee61de (diff) | |
download | chef-af4afcc712d24dbc85a9c020a124acadeed295d2.tar.gz |
autocorrecting Style/TrailingCommalcg/trailing_comma
chefstyle -a fixed 1044 occurrances
Diffstat (limited to 'spec/integration')
-rw-r--r-- | spec/integration/knife/chef_repo_path_spec.rb | 6 | ||||
-rw-r--r-- | spec/integration/knife/chefignore_spec.rb | 4 | ||||
-rw-r--r-- | spec/integration/knife/deps_spec.rb | 42 | ||||
-rw-r--r-- | spec/integration/knife/download_spec.rb | 8 | ||||
-rw-r--r-- | spec/integration/knife/show_spec.rb | 2 | ||||
-rw-r--r-- | spec/integration/knife/upload_spec.rb | 6 |
6 files changed, 34 insertions, 34 deletions
diff --git a/spec/integration/knife/chef_repo_path_spec.rb b/spec/integration/knife/chef_repo_path_spec.rb index 908657e5f7..31525cdf25 100644 --- a/spec/integration/knife/chef_repo_path_spec.rb +++ b/spec/integration/knife/chef_repo_path_spec.rb @@ -278,7 +278,7 @@ EOM %w(client cookbook data_bag environment node role user).each do |object_name| Chef::Config["#{object_name}_path".to_sym] = [ File.join(Chef::Config.chef_repo_path, "#{object_name}s"), - File.join(Chef::Config.chef_repo_path, "#{object_name}s2") + File.join(Chef::Config.chef_repo_path, "#{object_name}s2"), ] end Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2') @@ -516,7 +516,7 @@ EOM end Chef::Config.chef_repo_path = [ Chef::Config.chef_repo_path, - File.join(Chef::Config.chef_repo_path, 'chef_repo2') + File.join(Chef::Config.chef_repo_path, 'chef_repo2'), ] end @@ -677,7 +677,7 @@ EOM Chef::Config.delete(:chef_repo_path) Chef::Config.cookbook_path = [ File.join(@repository_dir, 'cookbooks'), - File.join(@repository_dir, 'chef_repo2', 'cookbooks') + File.join(@repository_dir, 'chef_repo2', 'cookbooks'), ] end diff --git a/spec/integration/knife/chefignore_spec.rb b/spec/integration/knife/chefignore_spec.rb index 34bf391f88..10cfbbf557 100644 --- a/spec/integration/knife/chefignore_spec.rb +++ b/spec/integration/knife/chefignore_spec.rb @@ -216,7 +216,7 @@ EOM before :each do Chef::Config.cookbook_path = [ File.join(Chef::Config.chef_repo_path, 'cookbooks1'), - File.join(Chef::Config.chef_repo_path, 'cookbooks2') + File.join(Chef::Config.chef_repo_path, 'cookbooks2'), ] end @@ -285,7 +285,7 @@ EOM before :each do Chef::Config.cookbook_path = [ File.join(Chef::Config.chef_repo_path, 'cookbooks1'), - File.join(Chef::Config.chef_repo_path, 'cookbooks2') + File.join(Chef::Config.chef_repo_path, 'cookbooks2'), ] end it 'knife list -Rfp /cookbooks shows the chefignore cookbook' do diff --git a/spec/integration/knife/deps_spec.rb b/spec/integration/knife/deps_spec.rb index b7333cefda..6861913d59 100644 --- a/spec/integration/knife/deps_spec.rb +++ b/spec/integration/knife/deps_spec.rb @@ -218,13 +218,13 @@ depends "self"' it 'knife deps prints each once' do knife('deps /cookbooks/foo /cookbooks/self').should_succeed( stdout: "/cookbooks/baz\n/cookbooks/bar\n/cookbooks/foo\n/cookbooks/self\n", - stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n" + stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n", ) end it 'knife deps --tree prints each once' do knife('deps --tree /cookbooks/foo /cookbooks/self').should_succeed( stdout: "/cookbooks/foo\n /cookbooks/bar\n /cookbooks/baz\n /cookbooks/foo\n/cookbooks/self\n", - stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n" + stderr: "WARN: Ignoring self-dependency in cookbook self, please remove it (in the future this will be fatal).\n", ) end end @@ -258,42 +258,42 @@ EOM knife('deps /blah').should_fail( :exit_code => 2, :stdout => "/blah\n", - :stderr => "ERROR: /blah: No such file or directory\n" + :stderr => "ERROR: /blah: No such file or directory\n", ) end it 'knife deps /roles/x.json reports an error' do knife('deps /roles/x.json').should_fail( :exit_code => 2, :stdout => "/roles/x.json\n", - :stderr => "ERROR: /roles/x.json: No such file or directory\n" + :stderr => "ERROR: /roles/x.json: No such file or directory\n", ) end it 'knife deps /nodes/x.json reports an error' do knife('deps /nodes/x.json').should_fail( :exit_code => 2, :stdout => "/nodes/x.json\n", - :stderr => "ERROR: /nodes/x.json: No such file or directory\n" + :stderr => "ERROR: /nodes/x.json: No such file or directory\n", ) end it 'knife deps /environments/x.json reports an error' do knife('deps /environments/x.json').should_fail( :exit_code => 2, :stdout => "/environments/x.json\n", - :stderr => "ERROR: /environments/x.json: No such file or directory\n" + :stderr => "ERROR: /environments/x.json: No such file or directory\n", ) end it 'knife deps /cookbooks/x reports an error' do knife('deps /cookbooks/x').should_fail( :exit_code => 2, :stdout => "/cookbooks/x\n", - :stderr => "ERROR: /cookbooks/x: No such file or directory\n" + :stderr => "ERROR: /cookbooks/x: No such file or directory\n", ) end it 'knife deps /data_bags/bag/item reports an error' do knife('deps /data_bags/bag/item').should_fail( :exit_code => 2, :stdout => "/data_bags/bag/item\n", - :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n" + :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n", ) end end @@ -305,7 +305,7 @@ EOM knife('deps /roles/starring.json').should_fail( :exit_code => 2, :stdout => "/cookbooks/quiche\n/roles/starring.json\n", - :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n" + :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n", ) end end @@ -317,7 +317,7 @@ EOM knife('deps /nodes/mort.json').should_fail( :exit_code => 2, :stdout => "/environments/desert.json\n/nodes/mort.json\n", - :stderr => "ERROR: /environments/desert.json: No such file or directory\n" + :stderr => "ERROR: /environments/desert.json: No such file or directory\n", ) end end @@ -329,7 +329,7 @@ EOM knife('deps /roles/starring.json').should_fail( :exit_code => 2, :stdout => "/roles/minor.json\n/roles/starring.json\n", - :stderr => "ERROR: /roles/minor.json: No such file or directory\n" + :stderr => "ERROR: /roles/minor.json: No such file or directory\n", ) end end @@ -343,7 +343,7 @@ EOM knife('deps /roles').should_fail( :exit_code => 2, :stderr => "ERROR: /roles: No such file or directory\n", - :stdout => "/roles\n" + :stdout => "/roles\n", ) end end @@ -596,42 +596,42 @@ EOM knife('deps --remote /blah').should_fail( :exit_code => 2, :stdout => "/blah\n", - :stderr => "ERROR: /blah: No such file or directory\n" + :stderr => "ERROR: /blah: No such file or directory\n", ) end it 'knife deps /roles/x.json reports an error' do knife('deps --remote /roles/x.json').should_fail( :exit_code => 2, :stdout => "/roles/x.json\n", - :stderr => "ERROR: /roles/x.json: No such file or directory\n" + :stderr => "ERROR: /roles/x.json: No such file or directory\n", ) end it 'knife deps /nodes/x.json reports an error' do knife('deps --remote /nodes/x.json').should_fail( :exit_code => 2, :stdout => "/nodes/x.json\n", - :stderr => "ERROR: /nodes/x.json: No such file or directory\n" + :stderr => "ERROR: /nodes/x.json: No such file or directory\n", ) end it 'knife deps /environments/x.json reports an error' do knife('deps --remote /environments/x.json').should_fail( :exit_code => 2, :stdout => "/environments/x.json\n", - :stderr => "ERROR: /environments/x.json: No such file or directory\n" + :stderr => "ERROR: /environments/x.json: No such file or directory\n", ) end it 'knife deps /cookbooks/x reports an error' do knife('deps --remote /cookbooks/x').should_fail( :exit_code => 2, :stdout => "/cookbooks/x\n", - :stderr => "ERROR: /cookbooks/x: No such file or directory\n" + :stderr => "ERROR: /cookbooks/x: No such file or directory\n", ) end it 'knife deps /data_bags/bag/item reports an error' do knife('deps --remote /data_bags/bag/item').should_fail( :exit_code => 2, :stdout => "/data_bags/bag/item\n", - :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n" + :stderr => "ERROR: /data_bags/bag/item: No such file or directory\n", ) end end @@ -643,7 +643,7 @@ EOM knife('deps --remote /roles/starring.json').should_fail( :exit_code => 2, :stdout => "/cookbooks/quiche\n/roles/starring.json\n", - :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n" + :stderr => "ERROR: /cookbooks/quiche: No such file or directory\n", ) end end @@ -655,7 +655,7 @@ EOM knife('deps --remote /nodes/mort.json').should_fail( :exit_code => 2, :stdout => "/environments/desert.json\n/nodes/mort.json\n", - :stderr => "ERROR: /environments/desert.json: No such file or directory\n" + :stderr => "ERROR: /environments/desert.json: No such file or directory\n", ) end end @@ -667,7 +667,7 @@ EOM knife('deps --remote /roles/starring.json').should_fail( :exit_code => 2, :stdout => "/roles/minor.json\n/roles/starring.json\n", - :stderr => "ERROR: /roles/minor.json: No such file or directory\n" + :stderr => "ERROR: /roles/minor.json: No such file or directory\n", ) end end diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb index 0c334fc65c..24618ebcae 100644 --- a/spec/integration/knife/download_spec.rb +++ b/spec/integration/knife/download_spec.rb @@ -314,7 +314,7 @@ EOM data_bag 'x', { 'added' => {}, 'modified' => { 'foo' => 'bar' }, - 'unmodified' => {} + 'unmodified' => {}, } end @@ -810,7 +810,7 @@ EOM data_bag 'x', { 'added' => {}, 'modified' => { 'foo' => 'bar' }, - 'unmodified' => {} + 'unmodified' => {}, } end @@ -1184,7 +1184,7 @@ EOM policy_group 'x', { 'policies' => { 'x' => { 'revision_id' => '1.0.0' }, - 'blah' => { 'revision_id' => '1.0.0' } + 'blah' => { 'revision_id' => '1.0.0' }, } } role 'x', {} @@ -1267,7 +1267,7 @@ EOM file 'policy_groups/x.json', { 'policies' => { 'x' => { 'revision_id' => '1.0.1' }, - 'y' => { 'revision_id' => '1.0.0' } + 'y' => { 'revision_id' => '1.0.0' }, } } file 'roles/x.json', { 'run_list' => [ 'blah' ] } diff --git a/spec/integration/knife/show_spec.rb b/spec/integration/knife/show_spec.rb index 8f1887e738..fad5126f66 100644 --- a/spec/integration/knife/show_spec.rb +++ b/spec/integration/knife/show_spec.rb @@ -132,7 +132,7 @@ EOM 'cookbook_versions' => { 'blah' => '= 1.0.0'}, 'override_attributes' => { 'x' => 'y' }, 'description' => 'woo', - 'name' => 'x' + 'name' => 'x', } end it 'knife show shows the attributes in a predetermined order', :skip => (RUBY_VERSION < "1.9") do diff --git a/spec/integration/knife/upload_spec.rb b/spec/integration/knife/upload_spec.rb index f7d4fb3cd4..6b7679de44 100644 --- a/spec/integration/knife/upload_spec.rb +++ b/spec/integration/knife/upload_spec.rb @@ -162,7 +162,7 @@ EOM it "should warn", :chef_lt_13_only do knife('upload /cookbooks').should_succeed( stdout: "Updated /cookbooks/x\n", - stderr: "WARN: Ignoring self-dependency in cookbook x, please remove it (in the future this will be fatal).\n" + stderr: "WARN: Ignoring self-dependency in cookbook x, please remove it (in the future this will be fatal).\n", ) knife('diff --name-status /').should_succeed '' end @@ -1345,7 +1345,7 @@ EOM policy_group 'x', { 'policies' => { 'x' => { 'revision_id' => '1.0.0' }, - 'blah' => { 'revision_id' => '1.0.0' } + 'blah' => { 'revision_id' => '1.0.0' }, } } role 'x', {} @@ -1386,7 +1386,7 @@ EOM policy_group 'x', { 'policies' => { 'x' => { 'revision_id' => '1.0.1' }, - 'y' => { 'revision_id' => '1.0.0' } + 'y' => { 'revision_id' => '1.0.0' }, } } role 'x', { 'run_list' => [ 'blah' ] } |