diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-22 13:31:30 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2014-12-22 13:31:30 -0700 |
| commit | 569c674773144dd4087c2ca0b31fbedbc4caaf14 (patch) | |
| tree | 5f58a5d02323f75e96011188483b1a5e4c866839 | |
| parent | 32f30d22d54556577c1dc6d4852c6f4df6f27c62 (diff) | |
| parent | 0bb73f03e495c6e2a358305a8ec6c65ca022dc19 (diff) | |
| download | rails-569c674773144dd4087c2ca0b31fbedbc4caaf14.tar.gz rails-569c674773144dd4087c2ca0b31fbedbc4caaf14.tar.bz2 rails-569c674773144dd4087c2ca0b31fbedbc4caaf14.zip | |
Merge pull request #18149 from arthurnn/byebug_on_mri
Only add debugger/byebug if on MRI
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/Gemfile | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/templates/Gemfile b/railties/lib/rails/generators/rails/plugin/templates/Gemfile index 35ad9fbf9e..ab8b8925eb 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/Gemfile +++ b/railties/lib/rails/generators/rails/plugin/templates/Gemfile @@ -37,7 +37,7 @@ end <% end -%> <% end -%> -<% unless defined?(JRUBY_VERSION) -%> +<% if RUBY_ENGINE == 'ruby' -%> # To use a debugger <%- if RUBY_VERSION < '2.0.0' -%> # gem 'debugger', group: [:development, :test] diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 5f9f7ad50a..38a082ab9e 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -340,7 +340,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_inclusion_of_a_debugger run_generator - if defined?(JRUBY_VERSION) + if defined?(JRUBY_VERSION) || RUBY_ENGINE == 'rbx' assert_file "Gemfile" do |content| assert_no_match(/byebug/, content) assert_no_match(/debugger/, content) |