From c5999c8f612a26ba6aa7e053e0ef34a4551f93d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 26 Jul 2010 20:25:02 +0200
Subject: [PATCH] Tests green on mongoid as well.

---
 test/integration/registerable_test.rb | 8 ++++----
 test/integration/rememberable_test.rb | 2 +-
 test/models/rememberable_test.rb      | 6 +++---
 test/models/validatable_test.rb       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/integration/registerable_test.rb b/test/integration/registerable_test.rb
index ff6f8a78..0da7db4d 100644
--- a/test/integration/registerable_test.rb
+++ b/test/integration/registerable_test.rb
@@ -65,8 +65,8 @@ class RegistrationTest < ActionController::IntegrationTest
     fill_in 'password confirmation', :with => '123456'
     click_button 'Sign up'
 
-    assert_template 'registrations/new'
-    assert_contain 'Email has already been taken'
+    assert_current_url '/users'
+    assert_contain(/Email .* already .* taken/)
 
     assert_not warden.authenticated?(:user)
   end
@@ -92,7 +92,7 @@ class RegistrationTest < ActionController::IntegrationTest
     fill_in 'current password', :with => '123456'
     click_button 'Update'
 
-    assert_template 'home/index'
+    assert_current_url '/'
     assert_contain 'You updated your account successfully.'
 
     assert_equal "user.new@email.com", User.first.email
@@ -122,7 +122,7 @@ class RegistrationTest < ActionController::IntegrationTest
     fill_in 'current password', :with => '123456'
     click_button 'Update'
 
-    assert_template 'home/index'
+    assert_current_url '/'
     assert_contain 'You updated your account successfully.'
 
     assert User.first.valid_password?('pas123')
diff --git a/test/integration/rememberable_test.rb b/test/integration/rememberable_test.rb
index 566cc690..f2c2ea6e 100644
--- a/test/integration/rememberable_test.rb
+++ b/test/integration/rememberable_test.rb
@@ -68,7 +68,7 @@ class RememberMeTest < ActionController::IntegrationTest
       user.reload
 
       assert warden.user(:user) == user
-      assert_equal old, user.remember_created_at
+      assert_equal old.to_i, user.remember_created_at.to_i
     end
   end
 
diff --git a/test/models/rememberable_test.rb b/test/models/rememberable_test.rb
index 1280cffa..99cc21ce 100644
--- a/test/models/rememberable_test.rb
+++ b/test/models/rememberable_test.rb
@@ -118,7 +118,7 @@ class RememberableTest < ActiveSupport::TestCase
       user.save
 
       user.remember_me!(false)
-      assert_not_equal old, user.remember_created_at
+      assert_not_equal old.to_i, user.remember_created_at.to_i
     end
   end
 
@@ -128,11 +128,11 @@ class RememberableTest < ActiveSupport::TestCase
       user.remember_me!(false)
       assert user.remember_created_at
 
-      user.remember_created_at = old = 10.minutes.ago
+      user.remember_created_at = old = 10.minutes.ago.utc
       user.save
 
       user.remember_me!(false)
-      assert_equal old, user.remember_created_at
+      assert_equal old.to_i, user.remember_created_at.to_i
     end
   end
 
diff --git a/test/models/validatable_test.rb b/test/models/validatable_test.rb
index a1df1901..8604126f 100644
--- a/test/models/validatable_test.rb
+++ b/test/models/validatable_test.rb
@@ -13,11 +13,11 @@ class ValidatableTest < ActiveSupport::TestCase
 
     user = new_user(:email => '')
     assert user.invalid?
-    assert_not_equal 'has already been taken', user.errors[:email].join
+    assert_no_match(/taken/, user.errors[:email].join)
 
     user.email = existing_user.email
     assert user.invalid?
-    assert_equal 'has already been taken', user.errors[:email].join
+    assert_match(/taken/, user.errors[:email].join)
   end
 
   test 'should require correct email format, allowing blank' do