3 files changed, 3 insertions, 13 deletions
diff --git a/activemodel/test/models/automobile.rb b/activemodel/test/models/automobile.rb
index ece644c40c..4df2fe8b3a 100644
--- a/activemodel/test/models/automobile.rb
+++ b/activemodel/test/models/automobile.rb
@@ -3,10 +3,11 @@ class Automobile
 
   validate :validations
 
-  attr_accessor :make, :model
+  attr_accessor :make, :model, :approved
 
   def validations
     validates_presence_of :make
     validates_length_of   :model, within: 2..10
+    validates_acceptance_of :approved, allow_nil: false
   end
 end
diff --git a/activemodel/test/models/oauthed_user.rb b/activemodel/test/models/oauthed_user.rb
deleted file mode 100644
index 9750bc19d4..0000000000
--- a/activemodel/test/models/oauthed_user.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class OauthedUser
-  extend ActiveModel::Callbacks
-  include ActiveModel::Validations
-  include ActiveModel::SecurePassword
-  
-  define_model_callbacks :create
-
-  has_secure_password(validations: false)
-
-  attr_accessor :password_digest, :password_salt
-end
diff --git a/activemodel/test/models/user.rb b/activemodel/test/models/user.rb
index 4b11df12bf..cbe259b1ad 100644
--- a/activemodel/test/models/user.rb
+++ b/activemodel/test/models/user.rb
@@ -7,5 +7,5 @@ class User
 
   has_secure_password
 
-  attr_accessor :password_digest, :password_salt
+  attr_accessor :password_digest
 end