X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/df6469c76b4d1f069a0831335a68e23ea1ebe0b1..5b33f3f8e31c62bc3e5db1d5b120533c3afdde68:/test/models/user_test.rb diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 90499e1b1..57c136475 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -4,9 +4,6 @@ require "test_helper" class UserTest < ActiveSupport::TestCase include Rails::Dom::Testing::Assertions::SelectorAssertions - api_fixtures - fixtures :user_roles - def test_invalid_with_empty_attributes user = User.new assert !user.valid? @@ -14,14 +11,15 @@ class UserTest < ActiveSupport::TestCase assert user.errors[:pass_crypt].any? assert user.errors[:display_name].any? assert user.errors[:email].any? - assert !user.errors[:home_lat].any? - assert !user.errors[:home_lon].any? - assert !user.errors[:home_zoom].any? + assert user.errors[:home_lat].none? + assert user.errors[:home_lon].none? + assert user.errors[:home_zoom].none? end def test_unique_email + existing_user = create(:user) new_user = User.new( - :email => users(:normal_user).email, + :email => existing_user.email, :status => "active", :pass_crypt => Digest::MD5.hexdigest("test"), :display_name => "new user", @@ -33,11 +31,12 @@ class UserTest < ActiveSupport::TestCase end def test_unique_display_name + existing_user = create(:user) new_user = User.new( :email => "tester@openstreetmap.org", :status => "pending", :pass_crypt => Digest::MD5.hexdigest("test"), - :display_name => users(:normal_user).display_name, + :display_name => existing_user.display_name, :data_public => 1, :description => "desc" ) @@ -46,10 +45,10 @@ class UserTest < ActiveSupport::TestCase end def test_email_valid - ok = %w(a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng - test_local@openstreetmap.org test-local@example.com) - bad = %w(hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します - 輕觸搖晃的遊戲@ah.com も対応します@s.name) + ok = %w[a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng + test_local@openstreetmap.org test-local@example.com] + bad = %w[hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します + 輕觸搖晃的遊戲@ah.com も対応します@s.name] ok.each do |name| user = build(:user) @@ -105,48 +104,51 @@ class UserTest < ActiveSupport::TestCase end end - def test_friend_with - create(:friend, :befriender => users(:normal_user), :befriendee => users(:public_user)) - assert users(:normal_user).is_friends_with?(users(:public_user)) - assert !users(:normal_user).is_friends_with?(users(:inactive_user)) - assert !users(:public_user).is_friends_with?(users(:normal_user)) - assert !users(:public_user).is_friends_with?(users(:inactive_user)) - assert !users(:inactive_user).is_friends_with?(users(:normal_user)) - assert !users(:inactive_user).is_friends_with?(users(:public_user)) + def test_friends_with + alice = create(:user, :active) + bob = create(:user, :active) + charlie = create(:user, :active) + create(:friend, :befriender => alice, :befriendee => bob) + + assert alice.is_friends_with?(bob) + assert !alice.is_friends_with?(charlie) + assert !bob.is_friends_with?(alice) + assert !bob.is_friends_with?(charlie) + assert !charlie.is_friends_with?(bob) + assert !charlie.is_friends_with?(alice) end def test_users_nearby - # second user has their data public and is close by normal user - assert_equal [users(:public_user), users(:german_user)], users(:normal_user).nearby - # second_user has normal user nearby, but normal user has their data private - assert_equal [users(:german_user)], users(:public_user).nearby - # inactive_user has no user nearby - assert_equal [], users(:inactive_user).nearby - # north_pole_user has no user nearby, and doesn't throw exception - assert_equal [], users(:north_pole_user).nearby - # confirmed_user has no home location - assert_equal [], users(:confirmed_user).nearby + alice = create(:user, :active, :home_lat => 51.0, :home_lon => 1.0, :data_public => false) + bob = create(:user, :active, :home_lat => 51.1, :home_lon => 1.0, :data_public => true) + charlie = create(:user, :active, :home_lat => 51.1, :home_lon => 1.1, :data_public => true) + david = create(:user, :active, :home_lat => 10.0, :home_lon => -123.0, :data_public => true) + _edward = create(:user, :suspended, :home_lat => 10.0, :home_lon => -123.0, :data_public => true) + south_pole_user = create(:user, :active, :home_lat => -90.0, :home_lon => 0.0, :data_public => true) + vagrant_user = create(:user, :active, :home_lat => nil, :home_lon => nil, :data_public => true) + + # bob and charlie are both near alice + assert_equal [bob, charlie], alice.nearby + # charlie and alice are both near bob, but alice has their data private + assert_equal [charlie], bob.nearby + # david has no user nearby, since edward is not active + assert_equal [], david.nearby + # south_pole_user has no user nearby, and doesn't throw exception + assert_equal [], south_pole_user.nearby + # vagrant_user has no home location + assert_equal [], vagrant_user.nearby end - def test_friends_with - # normal user is a friend of second user - # it should be a one way friend associatation - norm = users(:normal_user) - sec = users(:public_user) + def test_friend_users + norm = create(:user, :active) + sec = create(:user, :active) create(:friend, :befriender => norm, :befriendee => sec) - assert_equal 1, Friend.count + assert_equal [sec], norm.friend_users assert_equal 1, norm.friend_users.size - assert_equal 1, Friend.count - assert norm.is_friends_with?(sec) - assert !sec.is_friends_with?(norm) - assert !users(:normal_user).is_friends_with?(users(:inactive_user)) - assert !users(:public_user).is_friends_with?(users(:normal_user)) - assert !users(:public_user).is_friends_with?(users(:inactive_user)) - assert !users(:inactive_user).is_friends_with?(users(:normal_user)) - assert !users(:inactive_user).is_friends_with?(users(:public_user)) - # Friend.delete(friend) - # assert_equal 0, Friend.count + + assert_equal [], sec.friend_users + assert_equal 0, sec.friend_users.size end def test_user_preferred_editor @@ -213,15 +215,15 @@ class UserTest < ActiveSupport::TestCase create(:language, :code => "de") create(:language, :code => "sl") - user = users(:normal_user) + user = create(:user, :languages => ["en"]) assert_equal ["en"], user.languages - user.languages = %w(de fr en) - assert_equal %w(de fr en), user.languages - user.languages = %w(fr de sl) + user.languages = %w[de fr en] + assert_equal %w[de fr en], user.languages + user.languages = %w[fr de sl] assert_equal "de", user.preferred_language - assert_equal %w(fr de sl), user.preferred_languages.map(&:to_s) - user = users(:public_user) - assert_equal %w(en de), user.languages + assert_equal %w[fr de sl], user.preferred_languages.map(&:to_s) + user = create(:user, :languages => %w[en de]) + assert_equal %w[en de], user.languages end def test_visible?