summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-11-18 19:58:31 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2014-11-18 19:58:31 -0800
commitc0696e8ac90bcd90ea02eb131a282a635eedc46d (patch)
tree37b808d4cf8ff899254dead325e2878a72e8ec20 /spec
parent7398c705016e724c6ca3f0aabfefa2b23a0cfbf3 (diff)
parent3a69a92f622c1bcf49be712a6c41a1c0828346e5 (diff)
downloadchef-c0696e8ac90bcd90ea02eb131a282a635eedc46d.tar.gz
Merge pull request #2425 from opscode/lcg/memoize-localemh/recover
stop recomputing locale -a constantly
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/config_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb
index fb782da2c7..58fb229c96 100644
--- a/spec/unit/config_spec.rb
+++ b/spec/unit/config_spec.rb
@@ -434,7 +434,7 @@ describe Chef::Config do
expect(Chef::Log).to_not receive(:warn).with(/Please install an English UTF-8 locale for Chef to use/)
expect(Chef::Log).to_not receive(:debug).with(/Defaulting to locale en_US.UTF-8 on Windows/)
expect(Chef::Log).to_not receive(:debug).with(/No usable locale -a command found/)
- expect(Chef::Config[:internal_locale]).to eq expected_locale
+ expect(Chef::Config.guess_internal_locale).to eq expected_locale
end
end
@@ -485,7 +485,7 @@ describe Chef::Config do
it "should fall back to C locale" do
expect(Chef::Log).to receive(:warn).with("Please install an English UTF-8 locale for Chef to use, falling back to C locale and disabling UTF-8 support.")
- expect(Chef::Config[:internal_locale]).to eq 'C'
+ expect(Chef::Config.guess_internal_locale).to eq 'C'
end
end
@@ -502,7 +502,7 @@ describe Chef::Config do
else
expect(Chef::Log).to receive(:debug).with("No usable locale -a command found, assuming you have en_US.UTF-8 installed.")
end
- expect(Chef::Config[:internal_locale]).to eq "en_US.UTF-8"
+ expect(Chef::Config.guess_internal_locale).to eq "en_US.UTF-8"
end
end
end