diff options
Diffstat (limited to 'test/models')
| -rw-r--r-- | test/models/page_test.rb | 2 | ||||
| -rw-r--r-- | test/models/user_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/models/page_test.rb b/test/models/page_test.rb index 8b34399..afba8b5 100644 --- a/test/models/page_test.rb +++ b/test/models/page_test.rb | |||
| @@ -120,7 +120,7 @@ class PageTest < ActiveSupport::TestCase | |||
| 120 | 120 | ||
| 121 | english = page.translations.select {|x| x.locale == :en}.first | 121 | english = page.translations.select {|x| x.locale == :en}.first |
| 122 | Page::Translation.record_timestamps = false | 122 | Page::Translation.record_timestamps = false |
| 123 | english.update_attributes(:updated_at => (Time.now+25.hours)) | 123 | english.update(:updated_at => (Time.now+25.hours)) |
| 124 | Page::Translation.record_timestamps = true | 124 | Page::Translation.record_timestamps = true |
| 125 | assert_equal 1, Page.find_with_outdated_translations.count | 125 | assert_equal 1, Page.find_with_outdated_translations.count |
| 126 | 126 | ||
diff --git a/test/models/user_test.rb b/test/models/user_test.rb index bd5d059..6e4d2d7 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb | |||
| @@ -42,12 +42,12 @@ class UserTest < ActiveSupport::TestCase | |||
| 42 | end | 42 | end |
| 43 | 43 | ||
| 44 | def test_should_reset_password | 44 | def test_should_reset_password |
| 45 | users(:quentin).update_attributes(:password => 'new password', :password_confirmation => 'new password') | 45 | users(:quentin).update(:password => 'new password', :password_confirmation => 'new password') |
| 46 | assert_equal users(:quentin), User.authenticate('quentin', 'new password') | 46 | assert_equal users(:quentin), User.authenticate('quentin', 'new password') |
| 47 | end | 47 | end |
| 48 | 48 | ||
| 49 | def test_should_not_rehash_password | 49 | def test_should_not_rehash_password |
| 50 | users(:quentin).update_attributes(:login => 'quentin2') | 50 | users(:quentin).update(:login => 'quentin2') |
| 51 | assert_equal users(:quentin), User.authenticate('quentin2', 'monkey') | 51 | assert_equal users(:quentin), User.authenticate('quentin2', 'monkey') |
| 52 | end | 52 | end |
| 53 | 53 | ||
