aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/helper.rb
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2014-08-27 19:47:39 +0200
committerRobin Dupret <robin.dupret@gmail.com>2014-08-29 12:43:24 +0200
commit1da209fa9bb83ca7ee8a9a1722e124877e839936 (patch)
tree75ef534674d82ca5a448a234ee479abd188c20d9 /activejob/test/helper.rb
parent38d6c722b23bae2eeb82a63fc1e78c0937bed17a (diff)
downloadrails-1da209fa9bb83ca7ee8a9a1722e124877e839936.tar.gz
rails-1da209fa9bb83ca7ee8a9a1722e124877e839936.tar.bz2
rails-1da209fa9bb83ca7ee8a9a1722e124877e839936.zip
Avoid skipping Sidekiq tests on Rubinius
Now that Travis provides support for Rubinius 2.2.10, we can run the Sidekiq tests against this version.
Diffstat (limited to 'activejob/test/helper.rb')
-rw-r--r--activejob/test/helper.rb10
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}"