Permalink
Browse files

Merge pull request #13687 from gaurish/spring-has-no-love-for-jruby

Skip Spring App Generator tests on JRuby
  • Loading branch information...
2 parents 2b4ed72 + 4aca806 commit 3a521bc7d18304a7377807f99014b327ea6f8ffa @senny senny committed Jan 13, 2014
Showing with 2 additions and 0 deletions.
  1. +2 −0 railties/test/generators/app_generator_test.rb
@@ -458,12 +458,14 @@ def test_spring
end
def test_spring_binstubs
+ skip "spring doesn't run on JRuby" if defined?(JRUBY_VERSION)
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)
Process.stubs(:respond_to?).with(:fork).returns(false)
run_generator

0 comments on commit 3a521bc

Please sign in to comment.