Permalink
Browse files

Merge pull request #16585 from nicolasblanco/require_active_job

Require ActiveJob in case a skip_xxx option is given
  • Loading branch information...
rafaelfranca committed Aug 20, 2014
2 parents 3553816 + 2eacdb0 commit b03e0483f09928a8de6b0e7093faafa801505b6b
@@ -5,6 +5,7 @@
<% 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"
@@ -395,6 +395,7 @@ def test_no_active_record_or_test_unit_if_skips_given
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

0 comments on commit b03e048

Please sign in to comment.