aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorArun Agrawal <arunagw@gmail.com>2013-11-29 10:06:16 +0100
committerArun Agrawal <arunagw@gmail.com>2013-11-29 13:58:08 +0100
commit69bc21404ce5728d5aee091da5095914c18c75ee (patch)
tree9059b79d261b5070194f31428bbea2ed741c5725 /railties/test
parentb782731ce345d94d0929f284ea0c025005798380 (diff)
downloadrails-69bc21404ce5728d5aee091da5095914c18c75ee.tar.gz
rails-69bc21404ce5728d5aee091da5095914c18c75ee.tar.bz2
rails-69bc21404ce5728d5aee091da5095914c18c75ee.zip
Checking no debugger on JRuby
fixes tests for JRuby
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb8
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