From 78e581bd2f415b7a49e0fb7538ff6309b5ef2fdb Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Wed, 27 Apr 2011 23:25:27 +0200
Subject: [PATCH] some test renaming to avoid collisions, and some annoying
 issues between dbs

---
 activerecord/test/cases/persistence_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index 5567602a26..b066575af8 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -492,7 +492,7 @@ class PersistencesTest < ActiveRecord::TestCase
   end
 
   def test_update_attributes_as_admin
-    person = TightPerson.create
+    person = TightPerson.create({ "first_name" => 'Joshua' })
     person.update_attributes({ "first_name" => 'Josh', "gender" => 'm', "comments" => 'from NZ' }, :as => :admin)
     person.reload
 
@@ -501,8 +501,8 @@ class PersistencesTest < ActiveRecord::TestCase
     assert_equal 'from NZ', person.comments
   end
 
-  def test_update_attributes_as_without_protection
-    person = TightPerson.create
+  def test_update_attributes_without_protection
+    person = TightPerson.create({ "first_name" => 'Joshua' })
     person.update_attributes({ "first_name" => 'Josh', "gender" => 'm', "comments" => 'from NZ' }, :without_protection => true)
     person.reload
 
@@ -532,8 +532,8 @@ class PersistencesTest < ActiveRecord::TestCase
     Reply.reset_callbacks(:validate)
   end
 
-  def test_update_attributes_as_admin
-    person = TightPerson.create
+  def test_update_attributes_with_bang_as_admin
+    person = TightPerson.create({ "first_name" => 'Joshua' })
     person.update_attributes!({ "first_name" => 'Josh', "gender" => 'm', "comments" => 'from NZ' }, :as => :admin)
     person.reload
 
@@ -542,8 +542,8 @@ class PersistencesTest < ActiveRecord::TestCase
     assert_equal 'from NZ', person.comments
   end
 
-  def test_update_attributes_as_without_protection
-    person = TightPerson.create
+  def test_update_attributestes_with_bang_without_protection
+    person = TightPerson.create({ "first_name" => 'Joshua' })
     person.update_attributes!({ "first_name" => 'Josh', "gender" => 'm', "comments" => 'from NZ' }, :without_protection => true)
     person.reload