Set environment option's 'LC_ALL' to nil if not present in option.

1 files changed, 1 insertions, 9 deletions

diff --git a/spec/functional/mixin/shell_out_spec.rb b/spec/functional/mixin/shell_out_spec.rb
index 7e57de2a0a..55cd3c7c61 100644
--- a/spec/functional/mixin/shell_out_spec.rb
+++ b/spec/functional/mixin/shell_out_spec.rb
@@ -29,15 +29,7 @@ describe Chef::Mixin::ShellOut do
           shell_out_with_systems_locale('echo $LC_ALL')
         end
 
-        # From mixlib-shellout/lib/mixlib/shell_out.rb:
-        #
-        # * +environment+: a Hash of environment variables to set before the command
-        # is run. By default, the environment will *always* be set to 'LC_ALL' => 'C'
-        # to prevent issues with multibyte characters in Ruby 1.8. To avoid this,
-        # use :environment => nil for *no* extra environment settings, or
-        # :environment => {'LC_ALL'=>nil, ...} to set other environment settings
-        # without changing the locale.
-        cmd.stdout.chomp.should eq 'C'
+        cmd.stdout.chomp.should eq ENV['LC_ALL'].to_s
       end
     end