diff options
| author | Thom May <thom@may.lt> | 2016-11-10 10:26:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 10:26:21 +0000 |
| commit | c34212ea73a07260ab1e23370276124bae36371b (patch) | |
| tree | f68f27bac3936fe2040f60174bcccd1818b99b1f | |
| parent | 93e4b306065d934e8bef6a07661e933fb59d3d15 (diff) | |
| parent | c8282b416b330decefe56caca7428fc7f38d6144 (diff) | |
| download | ohai-c34212ea73a07260ab1e23370276124bae36371b.tar.gz | |
Merge pull request #898 from chef/old_helpers
Remove Ruby 1.8 / 1.9 spec helpers
| -rw-r--r-- | spec/spec_helper.rb | 2 | ||||
| -rw-r--r-- | spec/support/platform_helpers.rb | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8932cdc8..48c09f72 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -109,8 +109,6 @@ RSpec.configure do |config| config.filter_run_excluding :windows_only => true unless windows? config.filter_run_excluding :unix_only => true unless unix? - config.filter_run_excluding :ruby_18_only => true unless ruby_18? - config.filter_run_excluding :ruby_19_only => true unless ruby_19? config.filter_run_excluding :requires_root => true unless ENV["USER"] == "root" config.filter_run_excluding :requires_unprivileged_user => true if ENV["USER"] == "root" diff --git a/spec/support/platform_helpers.rb b/spec/support/platform_helpers.rb index 4a4cb91d..4f1eb1c8 100644 --- a/spec/support/platform_helpers.rb +++ b/spec/support/platform_helpers.rb @@ -1,17 +1,7 @@ -def ruby_19? - !!(RUBY_VERSION =~ /^1.9/) -end - -def ruby_18? - !!(RUBY_VERSION =~ /^1.8/) -end - def windows? !!(RUBY_PLATFORM =~ /mswin|mingw|windows/) end -# def jruby? - def unix? !windows? end |