summaryrefslogtreecommitdiff
path: root/spec/support/shared
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-02-18 18:39:11 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-02-18 18:39:11 -0800
commit6077b99f6ad1bc9a082f575f3818e69f05d8c8dc (patch)
treeae132bad653614ae549e6301a01f991f8cf5cb5b /spec/support/shared
parent8f9a0dbd88de3014161bebfef7a02821e0010a37 (diff)
downloadchef-6077b99f6ad1bc9a082f575f3818e69f05d8c8dc.tar.gz
deal with 0.37.2 renamed cops
252 Style/TrailingCommaInLiteral 84 Style/TrailingCommaInArguments 15 Style/SpaceAroundKeyword -- 351 Total We already dealt with SpaceAroundKeyword under its old name SpaceBeforeModifierKeyword, it looks like it got stricter about spaces after keywords. TrailingComma also got split, and it looks like the TrailingCommaInArguments behavior is new?
Diffstat (limited to 'spec/support/shared')
-rw-r--r--spec/support/shared/functional/http.rb6
-rw-r--r--spec/support/shared/functional/securable_resource.rb6
-rw-r--r--spec/support/shared/unit/user_and_client_shared.rb6
3 files changed, 9 insertions, 9 deletions
diff --git a/spec/support/shared/functional/http.rb b/spec/support/shared/functional/http.rb
index d6ba709c77..7e9e3f34c5 100644
--- a/spec/support/shared/functional/http.rb
+++ b/spec/support/shared/functional/http.rb
@@ -81,7 +81,7 @@ module ChefHTTPShared
# (expected_content should be uncompressed)
@api.get("/nyan_cat_content_length.png", 200, nil,
{
- "Content-Length" => nyan_uncompressed_size.to_s
+ "Content-Length" => nyan_uncompressed_size.to_s,
}
) {
File.open(nyan_uncompressed_filename, "rb") do |f|
@@ -109,7 +109,7 @@ module ChefHTTPShared
# (expected_content should be uncompressed)
@api.get("/nyan_cat_truncated.png", 200, nil,
{
- "Content-Length" => (nyan_uncompressed_size + 1).to_s
+ "Content-Length" => (nyan_uncompressed_size + 1).to_s,
}
) {
File.open(nyan_uncompressed_filename, "rb") do |f|
@@ -151,7 +151,7 @@ module ChefHTTPShared
#
@api.get("/forbidden", 403, "Forbidden",
{
- "Content-Length" => "Forbidden".bytesize.to_s
+ "Content-Length" => "Forbidden".bytesize.to_s,
}
)
diff --git a/spec/support/shared/functional/securable_resource.rb b/spec/support/shared/functional/securable_resource.rb
index dd8a0216bc..20be3c5c2f 100644
--- a/spec/support/shared/functional/securable_resource.rb
+++ b/spec/support/shared/functional/securable_resource.rb
@@ -409,7 +409,7 @@ shared_examples_for "a securable resource without existing target" do
expect(explicit_aces).to eq(
allowed_acl(SID.Everyone, expected_read_perms) +
- allowed_acl(SID.Guest, expected_modify_perms)
+ allowed_acl(SID.Guest, expected_modify_perms),
)
end
@@ -420,7 +420,7 @@ shared_examples_for "a securable resource without existing target" do
expect(explicit_aces).to eq(
denied_acl(SID.Guest, expected_modify_perms) +
- allowed_acl(SID.Everyone, expected_read_perms)
+ allowed_acl(SID.Everyone, expected_read_perms),
)
end
@@ -431,7 +431,7 @@ shared_examples_for "a securable resource without existing target" do
expect(explicit_aces).to eq(
denied_acl(SID.Guest, expected_modify_perms) +
- allowed_acl(SID.Everyone, expected_read_perms)
+ allowed_acl(SID.Everyone, expected_read_perms),
)
end
diff --git a/spec/support/shared/unit/user_and_client_shared.rb b/spec/support/shared/unit/user_and_client_shared.rb
index e3862943bc..e3481dfeca 100644
--- a/spec/support/shared/unit/user_and_client_shared.rb
+++ b/spec/support/shared/unit/user_and_client_shared.rb
@@ -58,8 +58,8 @@ shared_examples_for "user or client create" do
let(:chef_key) {
{
"chef_key" => {
- "public_key" => "some_public_key"
- }
+ "public_key" => "some_public_key",
+ },
}
}
@@ -75,7 +75,7 @@ shared_examples_for "user or client create" do
"chef_key" => {
"public_key" => "some_public_key",
"private_key" => "some_private_key",
- }
+ },
}
}