aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-01-13 06:33:25 -0800
committerYves Senn <yves.senn@gmail.com>2014-01-13 06:33:25 -0800
commit050f100d07e12466899c2ee04e3f8872b7e316f1 (patch)
tree90d2661d4153d682e50a42cdc3a90649e46406f5 /actionview
parente95031f55dd54945abebe6e9f8a12e428ada4146 (diff)
parent35e56f6fa535288abf1de7fa70c2faed5e2d88ff (diff)
downloadrails-050f100d07e12466899c2ee04e3f8872b7e316f1.tar.gz
rails-050f100d07e12466899c2ee04e3f8872b7e316f1.tar.bz2
rails-050f100d07e12466899c2ee04e3f8872b7e316f1.zip
Merge pull request #13693 from gaurish/typo
[JRuby] Fix incorrect RUBY_ENGINE value
Diffstat (limited to 'actionview')
-rw-r--r--actionview/test/abstract_unit.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
index 9928da4774..9eae3a4fbd 100644
--- a/actionview/test/abstract_unit.rb
+++ b/actionview/test/abstract_unit.rb
@@ -331,3 +331,11 @@ module ActionDispatch
end
end
+# Skips the current run on Rubinius using Minitest::Assertions#skip
+def rubinius_skip(message = '')
+ skip message if RUBY_ENGINE == 'rbx'
+end
+# Skips the current run on JRuby using Minitest::Assertions#skip
+def jruby_skip(message = '')
+ skip message if defined?(JRUBY_VERSION)
+end