diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-06-20 08:56:37 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2017-06-20 08:56:37 -0700 |
commit | afc542a82936ef09f6912965773bb641d316f355 (patch) | |
tree | 94665a4fe797c73e413e74dd19ad4d597b45f54b /spec/integration | |
parent | 14f693ba740decd876e67dbcb9f5d525ebbfdd8a (diff) | |
download | chef-afc542a82936ef09f6912965773bb641d316f355.tar.gz |
fixes for rubocop 0.49.1 engine
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'spec/integration')
-rw-r--r-- | spec/integration/knife/cookbook_bulk_delete_spec.rb | 4 | ||||
-rw-r--r-- | spec/integration/knife/cookbook_show_spec.rb | 4 | ||||
-rw-r--r-- | spec/integration/knife/environment_compare_spec.rb | 4 | ||||
-rw-r--r-- | spec/integration/knife/environment_show_spec.rb | 4 | ||||
-rw-r--r-- | spec/integration/knife/role_show_spec.rb | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/spec/integration/knife/cookbook_bulk_delete_spec.rb b/spec/integration/knife/cookbook_bulk_delete_spec.rb index 4740813ce1..912bd3bed5 100644 --- a/spec/integration/knife/cookbook_bulk_delete_spec.rb +++ b/spec/integration/knife/cookbook_bulk_delete_spec.rb @@ -34,7 +34,7 @@ describe "knife cookbook bulk delete", :workstation do cookbook "zfa", "0.6.5" end - # rubocop:disable Style/TrailingWhitespace + # rubocop:disable Layout/TrailingWhitespace it "knife cookbook bulk delete deletes all matching cookbooks" do stdout = <<EOM All versions of the following cookbooks will be deleted: @@ -58,7 +58,7 @@ fax 0.6.0 zfa 0.6.5 EOM end - # rubocop:enable Style/TrailingWhitespace + # rubocop:enable Layout/TrailingWhitespace end end diff --git a/spec/integration/knife/cookbook_show_spec.rb b/spec/integration/knife/cookbook_show_spec.rb index 1ccf7ffcb7..b89a26198a 100644 --- a/spec/integration/knife/cookbook_show_spec.rb +++ b/spec/integration/knife/cookbook_show_spec.rb @@ -34,7 +34,7 @@ describe "knife cookbook show", :workstation do knife("cookbook show x").should_succeed "x 1.0.0 0.6.5\n" end - # rubocop:disable Style/TrailingWhitespace + # rubocop:disable Layout/TrailingWhitespace it "knife cookbook show x 1.0.0 shows the correct version" do knife("cookbook show x 1.0.0").should_succeed <<EOM cookbook_name: x @@ -127,7 +127,7 @@ specificity: default url: http://127.0.0.1:8900/file_store/checksums/d41d8cd98f00b204e9800998ecf8427e EOM end - # rubocop:enable Style/TrailingWhitespace + # rubocop:enable Layout/TrailingWhitespace it "knife cookbook show x 1.0.0 recipes default.rb shows the default recipe" do knife("cookbook show x 1.0.0 recipes default.rb").should_succeed "file 'n'\n" diff --git a/spec/integration/knife/environment_compare_spec.rb b/spec/integration/knife/environment_compare_spec.rb index 3259b27d1b..720bead8c0 100644 --- a/spec/integration/knife/environment_compare_spec.rb +++ b/spec/integration/knife/environment_compare_spec.rb @@ -42,7 +42,7 @@ describe "knife environment compare", :workstation do } end - # rubocop:disable Style/TrailingWhitespace + # rubocop:disable Layout/TrailingWhitespace it "displays the cookbooks for a single environment" do knife("environment compare x").should_succeed <<EOM x @@ -69,6 +69,6 @@ krad >= 1.0.0 >= 1.0.0 EOM end - # rubocop:enable Style/TrailingWhitespace + # rubocop:enable Layout/TrailingWhitespace end end diff --git a/spec/integration/knife/environment_show_spec.rb b/spec/integration/knife/environment_show_spec.rb index 56422dc1a5..dabdfac6a2 100644 --- a/spec/integration/knife/environment_show_spec.rb +++ b/spec/integration/knife/environment_show_spec.rb @@ -30,7 +30,7 @@ describe "knife environment show", :workstation do } end - # rubocop:disable Style/TrailingWhitespace + # rubocop:disable Layout/TrailingWhitespace it "shows an environment" do knife("environment show b").should_succeed <<EOM chef_type: environment @@ -45,7 +45,7 @@ name: b override_attributes: EOM end - # rubocop:enable Style/TrailingWhitespace + # rubocop:enable Layout/TrailingWhitespace it "shows the requested attribute of an environment" do knife("environment show b -a default_attributes").should_succeed <<EOM diff --git a/spec/integration/knife/role_show_spec.rb b/spec/integration/knife/role_show_spec.rb index df2572447c..f655c03e8d 100644 --- a/spec/integration/knife/role_show_spec.rb +++ b/spec/integration/knife/role_show_spec.rb @@ -31,7 +31,7 @@ describe "knife role show", :workstation do role "cat", {} end - # rubocop:disable Style/TrailingWhitespace + # rubocop:disable Layout/TrailingWhitespace it "shows a cookbook" do knife("role show cons").should_succeed <<EOM chef_type: role @@ -44,7 +44,7 @@ override_attributes: run_list: EOM end - # rubocop:enable Style/TrailingWhitespace + # rubocop:enable Layout/TrailingWhitespace end end |