summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-10-27 20:36:51 -0700
committerJohn Keiser <john@johnkeiser.com>2015-10-27 20:36:51 -0700
commitf87153105104bb586b399352163fb901ea61ee86 (patch)
treef1b459f08b7e8290bf112495de831dd44f7aca78
parent2c8d87718ee529012e3c1a70202dfff7218dec4f (diff)
downloadchef-f87153105104bb586b399352163fb901ea61ee86.tar.gz
Change plural to singular
-rw-r--r--lib/chef/provider.rb4
-rw-r--r--spec/integration/recipes/resource_converge_if_changed_spec.rb14
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index d9d6b49894..d4cce075e5 100644
--- a/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
@@ -217,7 +217,7 @@ class Chef
property_size = modified.map { |p| p.size }.max
modified.map! do |p|
properties_str = if sensitive
- '(suppressed sensitive properties)'
+ '(suppressed sensitive property)'
else
"#{new_resource.send(p).inspect} (was #{current_resource.send(p).inspect})"
end
@@ -232,7 +232,7 @@ class Chef
created = properties.map do |property|
default = ' (default value)' unless new_resource.property_is_set?(property)
properties_str = if sensitive
- '(suppressed sensitive properties)'
+ '(suppressed sensitive property)'
else
new_resource.send(property).inspect
end
diff --git a/spec/integration/recipes/resource_converge_if_changed_spec.rb b/spec/integration/recipes/resource_converge_if_changed_spec.rb
index 362bbcbcaf..f3b562c50d 100644
--- a/spec/integration/recipes/resource_converge_if_changed_spec.rb
+++ b/spec/integration/recipes/resource_converge_if_changed_spec.rb
@@ -127,8 +127,8 @@ EOM
expect(converged_recipe.stdout).to eq <<-EOM
* #{resource_name}[blah] action create
- update default_identity1
- - set state1 to (suppressed sensitive properties)
- - set state2 to (suppressed sensitive properties)
+ - set state1 to (suppressed sensitive property)
+ - set state2 to (suppressed sensitive property)
EOM
end
end
@@ -290,9 +290,9 @@ EOM
expect(converged_recipe.stdout).to eq <<-EOM
* #{resource_name}[blah] action create
- create default_identity1
- - set identity1 to (suppressed sensitive properties) (default value)
- - set state1 to (suppressed sensitive properties)
- - set state2 to (suppressed sensitive properties)
+ - set identity1 to (suppressed sensitive property) (default value)
+ - set state1 to (suppressed sensitive property)
+ - set state2 to (suppressed sensitive property)
EOM
end
end
@@ -481,9 +481,9 @@ EOM
expect(converged_recipe.stdout).to eq <<-EOM
* #{resource_name}[blah] action create
- create default_identity1
- - set state1 to (suppressed sensitive properties)
+ - set state1 to (suppressed sensitive property)
- create default_identity1
- - set state2 to (suppressed sensitive properties)
+ - set state2 to (suppressed sensitive property)
EOM
end
end