diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/page_test.rb | 2 | ||||
| -rw-r--r-- | test/unit/user_test.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/unit/page_test.rb b/test/unit/page_test.rb index 099b79d..401d777 100644 --- a/test/unit/page_test.rb +++ b/test/unit/page_test.rb | |||
| @@ -118,7 +118,7 @@ class PageTest < ActiveSupport::TestCase | |||
| 118 | assert_equal 2, page.translations.size | 118 | assert_equal 2, page.translations.size |
| 119 | assert_equal 0, Page.find_with_outdated_translations.size | 119 | assert_equal 0, Page.find_with_outdated_translations.size |
| 120 | 120 | ||
| 121 | english = *page.translations.select {|x| x.locale == :en} | 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_attributes(:updated_at => (Time.now+25.hours)) |
| 124 | Page::Translation.record_timestamps = true | 124 | Page::Translation.record_timestamps = true |
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 47e3129..bd5d059 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb | |||
| @@ -16,28 +16,28 @@ class UserTest < ActiveSupport::TestCase | |||
| 16 | def test_should_require_login | 16 | def test_should_require_login |
| 17 | assert_no_difference 'User.count' do | 17 | assert_no_difference 'User.count' do |
| 18 | u = create_user(:login => nil) | 18 | u = create_user(:login => nil) |
| 19 | assert u.errors.on(:login) | 19 | assert u.errors[:login].any? |
| 20 | end | 20 | end |
| 21 | end | 21 | end |
| 22 | 22 | ||
| 23 | def test_should_require_password | 23 | def test_should_require_password |
| 24 | assert_no_difference 'User.count' do | 24 | assert_no_difference 'User.count' do |
| 25 | u = create_user(:password => nil) | 25 | u = create_user(:password => nil) |
| 26 | assert u.errors.on(:password) | 26 | assert u.errors[:password].any? |
| 27 | end | 27 | end |
| 28 | end | 28 | end |
| 29 | 29 | ||
| 30 | def test_should_require_password_confirmation | 30 | def test_should_require_password_confirmation |
| 31 | assert_no_difference 'User.count' do | 31 | assert_no_difference 'User.count' do |
| 32 | u = create_user(:password_confirmation => nil) | 32 | u = create_user(:password_confirmation => nil) |
| 33 | assert u.errors.on(:password_confirmation) | 33 | assert u.errors[:password_confirmation].any? |
| 34 | end | 34 | end |
| 35 | end | 35 | end |
| 36 | 36 | ||
| 37 | def test_should_require_email | 37 | def test_should_require_email |
| 38 | assert_no_difference 'User.count' do | 38 | assert_no_difference 'User.count' do |
| 39 | u = create_user(:email => nil) | 39 | u = create_user(:email => nil) |
| 40 | assert u.errors.on(:email) | 40 | assert u.errors[:email].any? |
| 41 | end | 41 | end |
| 42 | end | 42 | end |
| 43 | 43 | ||
