diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-01-12 23:44:36 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-01-12 23:44:36 -0800 |
| commit | 3a521bc7d18304a7377807f99014b327ea6f8ffa (patch) | |
| tree | 77e9c68271ecc81e648fe410f275d3e8ff017306 | |
| parent | 2b4ed7222518ad6d82dd8bebdf98cd70ebc356d1 (diff) | |
| parent | 4aca8060177131e2ddf0758c386f1b21c774b68a (diff) | |
| download | rails-3a521bc7d18304a7377807f99014b327ea6f8ffa.tar.gz rails-3a521bc7d18304a7377807f99014b327ea6f8ffa.tar.bz2 rails-3a521bc7d18304a7377807f99014b327ea6f8ffa.zip | |
Merge pull request #13687 from gaurish/spring-has-no-love-for-jruby
Skip Spring App Generator tests on JRuby
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
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 |