Merge pull request #860 from airblade/remove_sacrificial_column

Tests: remove sacrificial_column
paper-trail-gem · Sep 4, 2016 · 1da4763 · 1da4763
2 parents fd7756b + a522be0
commit 1da4763
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 6 deletions.
diff --git a/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb b/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb
@@ -32,7 +32,6 @@ def up
       t.time      :a_time
       t.date      :a_date
       t.boolean   :a_boolean
-      t.string    :sacrificial_column
       t.string    :type
       t.timestamps null: true
     end

diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb
@@ -250,12 +250,11 @@
     t.text     "a_text"
     t.integer  "an_integer"
     t.float    "a_float"
-    t.decimal  "a_decimal",          precision: 6, scale: 4
+    t.decimal  "a_decimal",  precision: 6, scale: 4
     t.datetime "a_datetime"
     t.time     "a_time"
     t.date     "a_date"
     t.boolean  "a_boolean"
-    t.string   "sacrificial_column"
     t.string   "type"
     t.datetime "created_at"
     t.datetime "updated_at"

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -95,7 +95,6 @@ def assert_changes_equal(expected, actual)
 def change_schema
   ActiveRecord::Migration.verbose = false
   ActiveRecord::Schema.define do
-    remove_column :widgets, :sacrificial_column
     add_column :versions, :custom_created_at, :datetime
   end
   ActiveRecord::Migration.verbose = true
@@ -121,7 +120,6 @@ def reset_version_class_column_info!
 def restore_schema
   ActiveRecord::Migration.verbose = false
   ActiveRecord::Schema.define do
-    add_column :widgets, :sacrificial_column, :string
     remove_column :versions, :custom_created_at
   end
   ActiveRecord::Migration.verbose = true

diff --git a/test/unit/model_test.rb b/test/unit/model_test.rb
@@ -520,7 +520,6 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         change_schema
         Widget.connection.schema_cache.clear!
         Widget.reset_column_information
-        assert_raise(NoMethodError) { Widget.new.sacrificial_column }
         @last = @widget.versions.last
       end