1 files changed, 12 insertions, 9 deletions
diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb
index a6cdc0a706..c396d30630 100755
--- a/activerecord/test/validations_test.rb
+++ b/activerecord/test/validations_test.rb
@@ -120,25 +120,28 @@ class ValidationsTest < Test::Unit::TestCase
     developer.name = "Just right"
     assert developer.save
   end
-end
 
+  def test_title_confirmation
+    Topic.validate_confirmation(:title)
 
-class MacroValidationsTest < Test::Unit::TestCase
-  fixtures :topics, :developers
+    t = Topic.create("title" => "We should be confirmed")
+    assert !t.save
 
-  def setup
-    Topic.validate_confirmation(:title)
-  end
+    t.title_confirmation = "We should be confirmed"
+    assert t.save
 
-  def teardown
     Topic.write_inheritable_attribute("validate_on_create", [])
   end
 
-  def test_title_confirmation
+  def test_terms_of_service_agreement
+    Topic.validate_acceptance(:terms_of_service)
+
     t = Topic.create("title" => "We should be confirmed")
     assert !t.save
 
-    t.title_confirmation = "We should be confirmed"
+    t.terms_of_service = "1"
     assert t.save
+
+    Topic.write_inheritable_attribute("validate_on_create", [])
   end
 end
 \ No newline at end of file