removed use of AR in AMo tests and removed testing of scopes (:on) in individual validation tests and moved them to their own test file

1 files changed, 15 insertions, 15 deletions

diff --git a/activemodel/test/cases/validations/acceptance_validation_test.rb b/activemodel/test/cases/validations/acceptance_validation_test.rb
index 11c9c1edfd..b316b8f17b 100644
--- a/activemodel/test/cases/validations/acceptance_validation_test.rb
+++ b/activemodel/test/cases/validations/acceptance_validation_test.rb
@@ -15,43 +15,43 @@ class AcceptanceValidationTest < ActiveModel::TestCase
   end
 
   def test_terms_of_service_agreement_no_acceptance
-    Topic.validates_acceptance_of(:terms_of_service, :on => :create)
+    Topic.validates_acceptance_of(:terms_of_service)
 
-    t = Topic.create("title" => "We should not be confirmed")
-    assert t.save
+    t = Topic.new("title" => "We should not be confirmed")
+    assert t.valid?
   end
 
   def test_terms_of_service_agreement
-    Topic.validates_acceptance_of(:terms_of_service, :on => :create)
+    Topic.validates_acceptance_of(:terms_of_service)
 
-    t = Topic.create("title" => "We should be confirmed","terms_of_service" => "")
-    assert !t.save
+    t = Topic.new("title" => "We should be confirmed","terms_of_service" => "")
+    assert t.invalid?
     assert_equal ["must be accepted"], t.errors[:terms_of_service]
 
     t.terms_of_service = "1"
-    assert t.save
+    assert t.valid?
   end
 
   def test_eula
-    Topic.validates_acceptance_of(:eula, :message => "must be abided", :on => :create)
+    Topic.validates_acceptance_of(:eula, :message => "must be abided")
 
-    t = Topic.create("title" => "We should be confirmed","eula" => "")
-    assert !t.save
+    t = Topic.new("title" => "We should be confirmed","eula" => "")
+    assert t.invalid?
     assert_equal ["must be abided"], t.errors[:eula]
 
     t.eula = "1"
-    assert t.save
+    assert t.valid?
   end
 
   def test_terms_of_service_agreement_with_accept_value
-    Topic.validates_acceptance_of(:terms_of_service, :on => :create, :accept => "I agree.")
+    Topic.validates_acceptance_of(:terms_of_service, :accept => "I agree.")
 
-    t = Topic.create("title" => "We should be confirmed", "terms_of_service" => "")
-    assert !t.save
+    t = Topic.new("title" => "We should be confirmed", "terms_of_service" => "")
+    assert t.invalid?
     assert_equal ["must be accepted"], t.errors[:terms_of_service]
 
     t.terms_of_service = "I agree."
-    assert t.save
+    assert t.valid?
   end
 
   def test_validates_acceptance_of_for_ruby_class