Merge pull request #13216 from arunagw/plugin-gemfile-jruby

Skipping debugger from plugin Gemfile for JRuby
rails · Dec 6, 2013 · 747c616 · 747c616
2 parents 6413fde + f1a05e7
commit 747c616
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/railties/lib/rails/generators/rails/plugin/templates/Gemfile b/railties/lib/rails/generators/rails/plugin/templates/Gemfile
@@ -39,5 +39,7 @@ end
 <% end -%>
 
 <% end -%>
+<% unless defined?(JRUBY_VERSION) -%>
 # To use debugger
 # gem 'debugger'
+<% end -%>
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
@@ -58,6 +58,17 @@ def test_generating_test_files_in_full_mode
     assert_file "test/integration/navigation_test.rb", /ActionDispatch::IntegrationTest/
   end
 
+  def test_inclusion_of_debugger
+    run_generator [destination_root, '--full']
+    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_generating_test_files_in_full_mode_without_unit_test_files
     run_generator [destination_root, "-T", "--full"]