diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 15:14:54 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 15:54:22 -0300 |
| commit | 4ab0320fb4ad61b65b1350b531e6993f79943803 (patch) | |
| tree | 9a3fcd8930b6366c04fc6df0d6898d7ab6fe33af /activejob | |
| parent | 93559da4826546d07014f8cfa399b64b4a143127 (diff) | |
| download | rails-4ab0320fb4ad61b65b1350b531e6993f79943803.tar.gz rails-4ab0320fb4ad61b65b1350b531e6993f79943803.tar.bz2 rails-4ab0320fb4ad61b65b1350b531e6993f79943803.zip | |
No need to disable sidikiq tests with 1.9.3 anymore
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/test/helper.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb index ec0c8a8ede..db5265d7b2 100644 --- a/activejob/test/helper.rb +++ b/activejob/test/helper.rb @@ -7,17 +7,6 @@ GlobalID.app = 'aj' @adapter = ENV['AJADAPTER'] || 'inline' -def sidekiq? - @adapter == 'sidekiq' -end - -def ruby_193? - RUBY_VERSION == '1.9.3' && RUBY_ENGINE != 'java' -end - -# Sidekiq doesn't work with MRI 1.9.3 -exit if sidekiq? && ruby_193? - if ENV['AJ_INTEGRATION_TESTS'] require 'support/integration/helper' else |