diff options
| author | George Claghorn <george.claghorn@gmail.com> | 2019-01-05 10:41:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-05 10:41:41 -0500 |
| commit | 7a88f649da0bd0b8c7534a90b4132cef8d9ec785 (patch) | |
| tree | 857111ffc3450e52e54aaf2f159e98608aab5f01 /actiontext/test/dummy | |
| parent | 35ed21bc1600a3687c63781b70f7543ca162997c (diff) | |
| parent | 67a9a86b1d69367a3270240dad43bc9825ca80a5 (diff) | |
| download | rails-7a88f649da0bd0b8c7534a90b4132cef8d9ec785.tar.gz rails-7a88f649da0bd0b8c7534a90b4132cef8d9ec785.tar.bz2 rails-7a88f649da0bd0b8c7534a90b4132cef8d9ec785.zip | |
Merge pull request #34875 from bogdanvlviv/test-actiontext-on-rails-6.0
Test actiontext on Rails 6.0
Diffstat (limited to 'actiontext/test/dummy')
4 files changed, 4 insertions, 3 deletions
diff --git a/actiontext/test/dummy/config/application.rb b/actiontext/test/dummy/config/application.rb index ddee05a4db..79eeb6ba0e 100644 --- a/actiontext/test/dummy/config/application.rb +++ b/actiontext/test/dummy/config/application.rb @@ -8,7 +8,7 @@ require "action_text" module Dummy class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 5.2 + config.load_defaults 6.0 # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers diff --git a/actiontext/test/dummy/db/migrate/20180208205311_create_messages.rb b/actiontext/test/dummy/db/migrate/20180208205311_create_messages.rb index 8e43559672..3552840824 100644 --- a/actiontext/test/dummy/db/migrate/20180208205311_create_messages.rb +++ b/actiontext/test/dummy/db/migrate/20180208205311_create_messages.rb @@ -1,4 +1,4 @@ -class CreateMessages < ActiveRecord::Migration[5.2] +class CreateMessages < ActiveRecord::Migration[6.0] def change create_table :messages do |t| t.string :subject diff --git a/actiontext/test/dummy/db/migrate/20180212164506_create_active_storage_tables.rb b/actiontext/test/dummy/db/migrate/20180212164506_create_active_storage_tables.rb index 360e0d1b7a..0b2ce257c8 100644 --- a/actiontext/test/dummy/db/migrate/20180212164506_create_active_storage_tables.rb +++ b/actiontext/test/dummy/db/migrate/20180212164506_create_active_storage_tables.rb @@ -21,6 +21,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2] t.datetime :created_at, null: false t.index [ :record_type, :record_id, :name, :blob_id ], name: "index_active_storage_attachments_uniqueness", unique: true + t.foreign_key :active_storage_blobs, column: :blob_id end end end diff --git a/actiontext/test/dummy/db/migrate/20181003185713_create_people.rb b/actiontext/test/dummy/db/migrate/20181003185713_create_people.rb index 1d5922d389..6928a8e20d 100644 --- a/actiontext/test/dummy/db/migrate/20181003185713_create_people.rb +++ b/actiontext/test/dummy/db/migrate/20181003185713_create_people.rb @@ -1,4 +1,4 @@ -class CreatePeople < ActiveRecord::Migration[5.2] +class CreatePeople < ActiveRecord::Migration[6.0] def change create_table :people do |t| t.string :name |