summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-01-19 09:54:30 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2016-01-19 09:54:30 -0800
commit600f83f177370adbd916666190989054d6fae1f0 (patch)
treee0afae6096aa4cbd7a390c74364a4bcf1bbf7862 /spec/integration
parent5834290bd3ff6ddabe4ef527f1543fcfb01e50bc (diff)
parent5976d21c1d68403301b6ca4345aca07071c63812 (diff)
downloadchef-600f83f177370adbd916666190989054d6fae1f0.tar.gz
Merge pull request #4424 from chef/lcg/chefstyle-catchup2
another chefstyle catchup + pull master
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/knife/download_spec.rb4
-rw-r--r--spec/integration/knife/upload_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb
index 57229b915a..86f1d9f4a4 100644
--- a/spec/integration/knife/download_spec.rb
+++ b/spec/integration/knife/download_spec.rb
@@ -1186,7 +1186,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", {}
@@ -1273,7 +1273,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/upload_spec.rb b/spec/integration/knife/upload_spec.rb
index 6ef40a1d98..afedf97459 100644
--- a/spec/integration/knife/upload_spec.rb
+++ b/spec/integration/knife/upload_spec.rb
@@ -1349,7 +1349,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", {}
@@ -1403,7 +1403,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" ] }