aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaurish Sharma <contact@gaurishsharma.com>2014-01-13 02:33:05 +0530
committerGaurish Sharma <contact@gaurishsharma.com>2014-01-13 02:58:03 +0530
commit4aca8060177131e2ddf0758c386f1b21c774b68a (patch)
treef6954710311b9d47b1c9b59143f0eab49fd7a534
parentdb11682c2bba19979d23198f73a5b118637bedd9 (diff)
downloadrails-4aca8060177131e2ddf0758c386f1b21c774b68a.tar.gz
rails-4aca8060177131e2ddf0758c386f1b21c774b68a.tar.bz2
rails-4aca8060177131e2ddf0758c386f1b21c774b68a.zip
Skip Spring App Generator tests on JRuby
Spring makes extensive use of Process.fork, so won't be able to provide JRuby Support, hence skip these tests on JRuby.
-rw-r--r--railties/test/generators/app_generator_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 43900e0fcf..56b25e4d9c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -458,12 +458,14 @@ class AppGeneratorTest < Rails::Generators::TestCase
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