From 35e56f6fa535288abf1de7fa70c2faed5e2d88ff Mon Sep 17 00:00:00 2001 From: Gaurish Sharma Date: Mon, 13 Jan 2014 16:54:06 +0530 Subject: standardize on jruby_skip & rbx_skip This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use these helpers instead of calls directly to RUBY_ENGINE/RbConfig/JRUBY_VERSION --- railties/test/generators/app_generator_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/test/generators') diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 56b25e4d9c..8246e76607 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -458,14 +458,14 @@ class AppGeneratorTest < Rails::Generators::TestCase end def test_spring_binstubs - skip "spring doesn't run on JRuby" if defined?(JRUBY_VERSION) + jruby_skip "spring doesn't run on JRuby" generator.stubs(:bundle_command).with('install') generator.expects(:bundle_command).with('exec spring binstub --all').once quietly { generator.invoke_all } end def test_spring_no_fork - skip "spring doesn't run on JRuby" if defined?(JRUBY_VERSION) + jruby_skip "spring doesn't run on JRuby" Process.stubs(:respond_to?).with(:fork).returns(false) run_generator -- cgit v1.2.3