diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-11 13:55:10 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-11 13:55:10 -0300 |
| commit | 7bb8fd2f641c3416522e647ed32a3142ccc1e01b (patch) | |
| tree | f32a83e4d4345558db39dab0cb46e9a692158b13 /railties/test/generators | |
| parent | 4e9c0b7874b0c01891f79af9ca2dd110a0529c50 (diff) | |
| parent | 545afc150e4491a69d72d61864680b98dce5a7b7 (diff) | |
| download | rails-7bb8fd2f641c3416522e647ed32a3142ccc1e01b.tar.gz rails-7bb8fd2f641c3416522e647ed32a3142ccc1e01b.tar.bz2 rails-7bb8fd2f641c3416522e647ed32a3142ccc1e01b.zip | |
Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_default
Improve debugging support
Diffstat (limited to 'railties/test/generators')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 7 | ||||
| -rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index b7bc721247..007dd886da 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -305,14 +305,17 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile", /gem 'jbuilder'/ end - def test_inclusion_of_debugger + def test_inclusion_of_a_debugger run_generator if defined?(JRUBY_VERSION) assert_file "Gemfile" do |content| + assert_no_match(/byebug/, content) assert_no_match(/debugger/, content) end - else + elsif RUBY_VERSION < '2.0.0' assert_file "Gemfile", /# gem 'debugger'/ + else + assert_file "Gemfile", /# gem 'byebug'/ end end diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 7a2701f813..853af80111 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -64,14 +64,17 @@ class PluginGeneratorTest < Rails::Generators::TestCase assert_file "test/integration/navigation_test.rb", /ActionDispatch::IntegrationTest/ end - def test_inclusion_of_debugger + def test_inclusion_of_a_debugger run_generator [destination_root, '--full'] if defined?(JRUBY_VERSION) assert_file "Gemfile" do |content| + assert_no_match(/byebug/, content) assert_no_match(/debugger/, content) end - else + elsif RUBY_VERSION < '2.0.0' assert_file "Gemfile", /# gem 'debugger'/ + else + assert_file "Gemfile", /# gem 'byebug'/ end end |