From e3152ea1c70e352d58400e7d8eea86ca8693a958 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 7 Mar 2012 16:44:58 +0000 Subject: [PATCH] Add some more unit tests for users --- test/fixtures/users.yml | 25 +++++++----- test/unit/user_test.rb | 88 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 10 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 09565cc3c..34ac9ce42 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -118,7 +118,7 @@ uppercase_user: pass_crypt: <%= Digest::MD5.hexdigest('test') %> creation_time: "2007-01-01 00:00:00" display_name: TEST - data_public: false + data_public: true description: test terms_agreed: "2010-01-01 11:22:33" terms_seen: true @@ -131,11 +131,8 @@ suspended_user: pass_crypt: <%= Digest::MD5.hexdigest('test') %> creation_time: "2007-01-01 00:00:00" display_name: suspended - data_public: false + data_public: true description: test - home_lat: 12.1 - home_lon: 12.1 - home_zoom: 3 terms_agreed: "2010-01-01 11:22:33" terms_seen: true languages: en @@ -147,11 +144,21 @@ deleted_user: pass_crypt: <%= Digest::MD5.hexdigest('test') %> creation_time: "2007-01-01 00:00:00" display_name: deleted - data_public: false + data_public: true + description: test + terms_agreed: "2010-01-01 11:22:33" + terms_seen: true + languages: en + +confirmed_user: + id: 12 + email: confirmed@openstreetmap.org + status: confirmed + pass_crypt: <%= Digest::MD5.hexdigest('test') %> + creation_time: "2007-01-01 00:00:00" + display_name: confirmed + data_public: true description: test - home_lat: 12.1 - home_lon: 12.1 - home_zoom: 3 terms_agreed: "2010-01-01 11:22:33" terms_seen: true languages: en diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 976a543cf..eb2f2a959 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper' class UserTest < ActiveSupport::TestCase api_fixtures - fixtures :friends + fixtures :friends, :languages, :user_roles def test_invalid_with_empty_attributes user = User.new @@ -153,4 +153,90 @@ class UserTest < ActiveSupport::TestCase user.preferred_editor = "invalid_editor" assert_raise(ActiveRecord::RecordInvalid) { user.save! } end + + def test_visible + assert_equal 10, User.visible.count + assert_raise ActiveRecord::RecordNotFound do + User.visible.find(users(:suspended_user).id) + end + assert_raise ActiveRecord::RecordNotFound do + User.visible.find(users(:deleted_user).id) + end + end + + def test_active + assert_equal 9, User.active.count + assert_raise ActiveRecord::RecordNotFound do + User.active.find(users(:inactive_user).id) + end + assert_raise ActiveRecord::RecordNotFound do + User.active.find(users(:suspended_user).id) + end + assert_raise ActiveRecord::RecordNotFound do + User.active.find(users(:deleted_user).id) + end + end + + def test_public + assert_equal 11, User.public.count + assert_raise ActiveRecord::RecordNotFound do + User.public.find(users(:normal_user).id) + end + end + + def test_languages + user = users(:normal_user) + assert_equal [ "en" ], user.languages + user.languages = [ "de", "fr", "en" ] + assert_equal [ "de", "fr", "en" ], user.languages + user.languages = [ "fr", "de", "sl" ] + assert_equal "de", user.preferred_language + assert_equal "de", user.preferred_language_from(["en", "sl", "de", "es"]) + end + + def test_visible? + assert_equal true, users(:inactive_user).visible? + assert_equal true, users(:normal_user).visible? + assert_equal true, users(:confirmed_user).visible? + assert_equal false, users(:suspended_user).visible? + assert_equal false, users(:deleted_user).visible? + end + + def test_active? + assert_equal false, users(:inactive_user).active? + assert_equal true, users(:normal_user).active? + assert_equal true, users(:confirmed_user).active? + assert_equal false, users(:suspended_user).active? + assert_equal false, users(:deleted_user).active? + end + + def test_moderator? + assert_equal false, users(:normal_user).moderator? + assert_equal true, users(:moderator_user).moderator? + end + + def test_administrator? + assert_equal false, users(:normal_user).administrator? + assert_equal true, users(:administrator_user).administrator? + end + + def test_has_role? + assert_equal false, users(:normal_user).has_role?("administrator") + assert_equal false, users(:normal_user).has_role?("moderator") + assert_equal true, users(:administrator_user).has_role?("administrator") + assert_equal true, users(:moderator_user).has_role?("moderator") + end + + def test_delete + user = users(:normal_user) + user.delete + assert_equal "user_#{user.id}", user.display_name + assert_blank user.description + assert_equal nil, user.home_lat + assert_equal nil, user.home_lon + assert_equal false, user.image.file? + assert_equal "deleted", user.status + assert_equal false, user.visible? + assert_equal false, user.active? + end end -- 2.39.5