diff options
author | tyler-ball <tyleraball@gmail.com> | 2014-11-25 14:45:10 -0800 |
---|---|---|
committer | tyler-ball <tyleraball@gmail.com> | 2014-11-25 14:45:10 -0800 |
commit | 2e3ea9d76d4b8e912ff88b22b9cb29b9c8d9009c (patch) | |
tree | 70c0ccd28fab446b92a5db0ce6797fcfd49f7e2a /spec/unit/config_spec.rb | |
parent | 2cabf9c5ba969ff89128d5334e36a76c766fce93 (diff) | |
parent | 5bab29b02248a4468a7fbf7f6226c30255c3abe3 (diff) | |
download | chef-2e3ea9d76d4b8e912ff88b22b9cb29b9c8d9009c.tar.gz |
Merge branch 'master' into tball/contrib-pass
Conflicts:
CHANGELOG.md
Diffstat (limited to 'spec/unit/config_spec.rb')
-rw-r--r-- | spec/unit/config_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb index 58fb229c96..ed2003e8bf 100644 --- a/spec/unit/config_spec.rb +++ b/spec/unit/config_spec.rb @@ -426,7 +426,7 @@ describe Chef::Config do let(:locales) { locale_array.join("\n") } before do - allow(Chef::Config).to receive(:shell_out_with_systems_locale).with("locale -a").and_return(shell_out) + allow(Chef::Config).to receive(:shell_out_with_systems_locale!).with("locale -a").and_return(shell_out) end shared_examples_for "a suitable locale" do @@ -493,7 +493,7 @@ describe Chef::Config do let(:locale_array) { [] } before do - allow(Chef::Config).to receive(:shell_out_with_systems_locale).and_raise("THIS IS AN ERROR") + allow(Chef::Config).to receive(:shell_out_with_systems_locale!).and_raise("THIS IS AN ERROR") end it "should default to 'en_US.UTF-8'" do |