diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-08-29 10:39:40 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-08-29 10:39:40 -0300 |
| commit | cf75695dc0ebe0b71e92401217e40478545d9a20 (patch) | |
| tree | 75ef534674d82ca5a448a234ee479abd188c20d9 | |
| parent | 38d6c722b23bae2eeb82a63fc1e78c0937bed17a (diff) | |
| parent | 1da209fa9bb83ca7ee8a9a1722e124877e839936 (diff) | |
| download | rails-cf75695dc0ebe0b71e92401217e40478545d9a20.tar.gz rails-cf75695dc0ebe0b71e92401217e40478545d9a20.tar.bz2 rails-cf75695dc0ebe0b71e92401217e40478545d9a20.zip | |
Merge pull request #16742 from robin850/rbx-aj-sidekiq
Avoid skipping Sidekiq tests on Rubinius
| -rw-r--r-- | activejob/test/helper.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb index a56b35da12..85094387ef 100644 --- a/activejob/test/helper.rb +++ b/activejob/test/helper.rb @@ -10,18 +10,12 @@ def sidekiq? @adapter == 'sidekiq' end -def rubinius? - RUBY_ENGINE == 'rbx' -end - def ruby_193? RUBY_VERSION == '1.9.3' && RUBY_ENGINE != 'java' end -#Sidekiq don't work with MRI 1.9.3 -#Travis uses rbx 2.6 which don't support unicode characters in methods. -#Remove the check when Travis change to rbx 2.7+ -exit if sidekiq? && (ruby_193? || rubinius?) +# Sidekiq doesn't work with MRI 1.9.3 +exit if sidekiq? && ruby_193? require "adapters/#{@adapter}" |