Tests green on mongoid as well.

This commit is contained in:
José Valim 2010-07-26 20:25:02 +02:00
parent 680f2612f4
commit c5999c8f61
4 changed files with 10 additions and 10 deletions

View File

@ -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')

View File

@ -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

View File

@ -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

View File

@ -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