diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-20 13:12:05 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-08-20 13:12:05 -0300 |
| commit | b03e0483f09928a8de6b0e7093faafa801505b6b (patch) | |
| tree | 983286fbfd0c5d44f6aa6443f3831a7400ebf732 | |
| parent | 355381698054779d7767105f88368b9eee279ebe (diff) | |
| parent | 2eacdb0cbf558a46faeb42abc2df02adc4f677ae (diff) | |
| download | rails-b03e0483f09928a8de6b0e7093faafa801505b6b.tar.gz rails-b03e0483f09928a8de6b0e7093faafa801505b6b.tar.bz2 rails-b03e0483f09928a8de6b0e7093faafa801505b6b.zip | |
Merge pull request #16585 from nicolasblanco/require_active_job
Require ActiveJob in case a skip_xxx option is given
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index 23db8b5153..80393a16ba 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -5,6 +5,7 @@ require 'rails/all' <% else -%> # Pick the frameworks you want: require "active_model/railtie" +require "active_job/railtie" <%= comment_if :skip_active_record %>require "active_record/railtie" require "action_controller/railtie" require "action_mailer/railtie" diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 70c439672f..d687a8f506 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -395,6 +395,7 @@ class AppGeneratorTest < Rails::Generators::TestCase run_generator [destination_root, "--skip-test-unit", "--skip-active-record"] assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/ assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/ + assert_file "config/application.rb", /\s+require\s+["']active_job\/railtie["']/ end def test_new_hash_style |