summaryrefslogtreecommitdiff
path: root/spec/functional/mixin
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-08-29 15:19:23 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-09-08 11:10:05 -0700
commitd6f6928fd1097709189cd78689e89032d4c9318d (patch)
tree9a42a5c5784824cc8f32687f337eacb199c70ad8 /spec/functional/mixin
parent3fb87cc744d1e1134476496dedc9125a25add859 (diff)
downloadchef-d6f6928fd1097709189cd78689e89032d4c9318d.tar.gz
unicode shell_out fixes plus mixlib-shellout 2.x
- use en_US.UTF-8 explicitly rather than relying on mixlib-shellout's 'C' locale in order to force the LANG by default (restores unicode to most chef-client calls now)
Diffstat (limited to 'spec/functional/mixin')
-rw-r--r--spec/functional/mixin/shell_out_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/functional/mixin/shell_out_spec.rb b/spec/functional/mixin/shell_out_spec.rb
index 92492fcf6f..35e5b30eae 100644
--- a/spec/functional/mixin/shell_out_spec.rb
+++ b/spec/functional/mixin/shell_out_spec.rb
@@ -29,7 +29,7 @@ describe Chef::Mixin::ShellOut do
shell_out_with_systems_locale('echo $LC_ALL')
end
- cmd.stdout.chomp.should match_environment_variable('LC_ALL')
+ expect(cmd.stdout.chomp).to match_environment_variable('LC_ALL')
end
end
@@ -41,7 +41,7 @@ describe Chef::Mixin::ShellOut do
shell_out_with_systems_locale('echo $LC_ALL', :environment => {'LC_ALL' => 'POSIX'})
end
- cmd.stdout.chomp.should eq 'POSIX'
+ expect(cmd.stdout.chomp).to eq 'POSIX'
end
end
end