diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2017-07-16 11:39:09 +0900 |
|---|---|---|
| committer | Kir Shatrov <shatrov@me.com> | 2017-07-20 22:43:13 +0300 |
| commit | 56de573131cce08079c30d7631395726104eea1b (patch) | |
| tree | cae0515e1b6cff2a268f164d630a2cb6729f49f0 /activerecord/test | |
| parent | 831be98f9a6685da3410b0c9bf4143bd8dd647af (diff) | |
| download | rails-56de573131cce08079c30d7631395726104eea1b.tar.gz rails-56de573131cce08079c30d7631395726104eea1b.tar.bz2 rails-56de573131cce08079c30d7631395726104eea1b.zip | |
Reset column information after schema changed
This fixes the following failures.
https://travis-ci.org/rails/rails/jobs/253990014
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/null_relation_test.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 8bf2ecf88d..7e4ded9fc9 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -217,6 +217,8 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase remove_column :admin_users, :region_id if column_exists?(:admin_users, :region_id) drop_table :admin_regions, if_exists: true end + + Admin::User.reset_column_information end def test_natural_assignment diff --git a/activerecord/test/cases/null_relation_test.rb b/activerecord/test/cases/null_relation_test.rb index 56f5a89686..17527568f8 100644 --- a/activerecord/test/cases/null_relation_test.rb +++ b/activerecord/test/cases/null_relation_test.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require "cases/helper" require "models/developer" require "models/comment" |