diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/mixlib/shellout_spec.rb | 6 | ||||
| -rw-r--r-- | spec/support/platform_helpers.rb | 9 |
2 files changed, 1 insertions, 14 deletions
diff --git a/spec/mixlib/shellout_spec.rb b/spec/mixlib/shellout_spec.rb index 7e93054..38915f3 100644 --- a/spec/mixlib/shellout_spec.rb +++ b/spec/mixlib/shellout_spec.rb @@ -17,10 +17,7 @@ describe Mixlib::ShellOut do let(:ruby_code) { raise 'define let(:ruby_code)' } let(:options) { nil } - # On some testing environments, we have gems that creates a deprecation notice sent - # out on STDERR. To fix that, we disable gems on Ruby 1.9.2 - let(:ruby_eval) { lambda { |code| "ruby #{disable_gems} -e '#{code}'" } } - let(:disable_gems) { ( ruby_19? ? '--disable-gems' : '') } + let(:ruby_eval) { lambda { |code| "ruby -e '#{code}'" } } context 'when instantiating' do subject { shell_cmd } @@ -1144,7 +1141,6 @@ describe Mixlib::ShellOut do context 'on unix', :unix_only do def ruby_wo_shell(code) parts = %w[ruby] - parts << "--disable-gems" if ruby_19? parts << "-e" parts << code end diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index c730b4d..bbf7d15 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -1,12 +1,3 @@ - -def ruby_19? - !!(RUBY_VERSION =~ /^1.9/) -end - -def ruby_18? - !!(RUBY_VERSION =~ /^1.8/) -end - def windows? !!(RUBY_PLATFORM =~ /mswin|mingw|windows/) end |