diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-11-29 07:05:29 -0800 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-11-29 07:05:29 -0800 |
| commit | 60e862a174b9d63dc2dc4955516f09a33f49d028 (patch) | |
| tree | fd70040db387a30984284a2b281a9f9279a1b907 /railties/test | |
| parent | 450b6c75bbc6d07dd755530e282fdad17f504d12 (diff) | |
| parent | 69bc21404ce5728d5aee091da5095914c18c75ee (diff) | |
| download | rails-60e862a174b9d63dc2dc4955516f09a33f49d028.tar.gz rails-60e862a174b9d63dc2dc4955516f09a33f49d028.tar.bz2 rails-60e862a174b9d63dc2dc4955516f09a33f49d028.zip | |
Merge pull request #13097 from arunagw/jruby-test-fixes
Skipping debugger inclusion test if JRuby
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 6f03cf3083..73b54c2cb6 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -364,7 +364,13 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_inclusion_of_debugger run_generator - assert_file "Gemfile", /# gem 'debugger'/ + if defined?(JRUBY_VERSION) + assert_file "Gemfile" do |content| + assert_no_match(/debugger/, content) + end + else + assert_file "Gemfile", /# gem 'debugger'/ + end end def test_inclusion_of_lazy_loaded_sdoc |