diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-11-06 17:25:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 17:25:54 -0500 |
| commit | 63f0c04850dd0bcdc7d35266e81fa1a7778570a8 (patch) | |
| tree | 86df79ca9d7d2508e3d75d3ee4fd4e147b30278b /activejob | |
| parent | 256a44c4398a5cd268dbcd8ea4171210b6fe7230 (diff) | |
| parent | cb8553c95d345e40b448cf8e10aa033ff0ede4f2 (diff) | |
| download | rails-63f0c04850dd0bcdc7d35266e81fa1a7778570a8.tar.gz rails-63f0c04850dd0bcdc7d35266e81fa1a7778570a8.tar.bz2 rails-63f0c04850dd0bcdc7d35266e81fa1a7778570a8.zip | |
Merge pull request #30101 from bogdanvlviv/initialization-active_storage
Provide initialization of Active Storage
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/test/support/integration/dummy_app_template.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/helper.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb index ac382bd1b7..7ea78c3350 100644 --- a/activejob/test/support/integration/dummy_app_template.rb +++ b/activejob/test/support/integration/dummy_app_template.rb @@ -4,8 +4,6 @@ if ENV["AJ_ADAPTER"] == "delayed_job" generate "delayed_job:active_record", "--quiet" end -rails_command("db:migrate") - initializer "activejob.rb", <<-CODE require "#{File.expand_path("jobs_manager.rb", __dir__)}" JobsManager.current_manager.setup diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb index a058da141f..a02d874e2e 100644 --- a/activejob/test/support/integration/helper.rb +++ b/activejob/test/support/integration/helper.rb @@ -18,6 +18,7 @@ Rails::Generators::AppGenerator.start args require "#{dummy_app_path}/config/environment.rb" ActiveRecord::Migrator.migrations_paths = [ Rails.root.join("db/migrate").to_s ] +ActiveRecord::Tasks::DatabaseTasks.migrate require "rails/test_help" Rails.backtrace_cleaner.remove_silencers! |