From 912af7ef91a12c66f9f93a678288a99df25fa595 Mon Sep 17 00:00:00 2001
From: Kyle Keesling <kyle.keesling@gmail.com>
Date: Sat, 9 Mar 2019 21:38:15 -0500
Subject: [PATCH] update test fixture schema to use timestamps instead of
 timestamp

- discovered via @wasifhossain
- Update CHANGELOG.md
---
 CHANGELOG.md                   |  3 +++
 test/fixtures/active_record.rb | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0cace8f..4c638d73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ Breaking changes:
 Features:
 
 Fixes:
+- [#2319](https://github.com/rails-api/active_model_serializers/pull/2319) Fixes #2316. (@kylekeesling)
+  - Fix Rails 6.0 deprication warnings
+  - update test fixture schema to use `timestamps` instead of `timestamp`
 
 Misc:
 
diff --git a/test/fixtures/active_record.rb b/test/fixtures/active_record.rb
index 336c27e3..132a43b1 100644
--- a/test/fixtures/active_record.rb
+++ b/test/fixtures/active_record.rb
@@ -19,28 +19,28 @@ ActiveRecord::Schema.define do
     t.text :contents
     t.references :author
     t.references :post
-    t.timestamp null: false
+    t.timestamps null: false
   end
   create_table :employees, force: true do |t|
     t.string :name
     t.string :email
-    t.timestamp null: false
+    t.timestamps null: false
   end
   create_table :object_tags, force: true do |t|
     t.string :poly_tag_id
     t.string :taggable_type
     t.string :taggable_id
-    t.timestamp null: false
+    t.timestamps null: false
   end
   create_table :poly_tags, force: true do |t|
     t.string :phrase
-    t.timestamp null: false
+    t.timestamps null: false
   end
   create_table :pictures, force: true do |t|
     t.string :title
     t.string :imageable_type
     t.string :imageable_id
-    t.timestamp null: false
+    t.timestamps null: false
   end
 end