diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-08-11 17:37:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 17:37:00 -0400 |
| commit | 58c5981721b7da55bcb56b463355949be02fd8d6 (patch) | |
| tree | 1dbf8270aa3a0e1ae572162ebd00e3df898dd3a7 /railties/lib | |
| parent | 9804e4c30c11bf755aa3181a8b1b54297d7fd19e (diff) | |
| parent | 0664c6ceb28cea57eca21957881c224efe2484e8 (diff) | |
| download | rails-58c5981721b7da55bcb56b463355949be02fd8d6.tar.gz rails-58c5981721b7da55bcb56b463355949be02fd8d6.tar.bz2 rails-58c5981721b7da55bcb56b463355949be02fd8d6.zip | |
Merge pull request #30092 from bogdanvlviv/prevent-generation-extra-empty-lines
Prevent generation extra empty lines in a plugin's Rakefile
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/plugin_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/Rakefile | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index dc1492a2d7..a40fa78132 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -76,8 +76,8 @@ module Rails template "test/test_helper.rb" template "test/%namespaced_name%_test.rb" append_file "Rakefile", <<-EOF -#{rakefile_test_tasks} +#{rakefile_test_tasks} task default: :test EOF if engine? diff --git a/railties/lib/rails/generators/rails/plugin/templates/Rakefile b/railties/lib/rails/generators/rails/plugin/templates/Rakefile index 3581dd401a..f3efe21cf1 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin/templates/Rakefile @@ -13,17 +13,16 @@ RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('README.md') rdoc.rdoc_files.include('lib/**/*.rb') end - <% if engine? && !options[:skip_active_record] && with_dummy_app? -%> + APP_RAKEFILE = File.expand_path("<%= dummy_path -%>/Rakefile", __dir__) load 'rails/tasks/engine.rake' -<% end %> - +<% end -%> <% if engine? -%> -load 'rails/tasks/statistics.rake' -<% end %> +load 'rails/tasks/statistics.rake' +<% end -%> <% unless options[:skip_gemspec] -%> require 'bundler/gem_tasks' -<% end %> +<% end -%> |