Merge remote-tracking branch 'openstreetmap/pull/1423'

app/models/user_role.rb

@@ -1,5 +1,6 @@
 class UserRole < ActiveRecord::Base
   belongs_to :user
+  belongs_to :granter, :class_name => "User"
 
   ALL_ROLES = %w(administrator moderator).freeze
 

test/factories/user.rb

@@ -0,0 +1,44 @@
+FactoryGirl.define do
+  factory :user do
+    sequence(:email) { |n| "user#{n}@example.com" }
+    sequence(:display_name) { |n| "User #{n}" }
+    pass_crypt Digest::MD5.hexdigest("test")
+
+    trait :with_home_location do
+      home_lat { rand(-90.0...90.0) }
+      home_lon { rand(-180.0...180.0) }
+    end
+
+    trait :pending do
+      status "pending"
+    end
+
+    trait :active do
+      status "active"
+    end
+
+    trait :confirmed do
+      status "confirmed"
+    end
+
+    trait :suspended do
+      status "suspended"
+    end
+
+    trait :deleted do
+      status "deleted"
+    end
+
+    factory :moderator_user do
+      after(:create) do |user, _evaluator|
+        create(:user_role, :role => "moderator", :user => user)
+      end
+    end
+
+    factory :administrator_user do
+      after(:create) do |user, _evaluator|
+        create(:user_role, :role => "administrator", :user => user)
+      end
+    end
+  end
+end

test/factories/user_role.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :user_role do
+    user
+    association :granter, :factory => :user
+  end
+end

test/models/user_test.rb

@@ -20,8 +20,9 @@ class UserTest < ActiveSupport::TestCase
   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 +34,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"
     )
@@ -52,20 +54,20 @@ class UserTest < ActiveSupport::TestCase
              輕觸搖晃的遊戲@ah.com も対応します@s.name)
 
     ok.each do |name|
-      user = users(:normal_user)
+      user = build(:user)
       user.email = name
       assert user.valid?(:save), user.errors.full_messages.join(",")
     end
 
     bad.each do |name|
-      user = users(:normal_user)
+      user = build(:user)
       user.email = name
       assert user.invalid?(:save), "#{name} is valid when it shouldn't be"
     end
   end
 
   def test_display_name_length
-    user = users(:normal_user)
+    user = build(:user)
     user.display_name = "123"
     assert user.valid?, " should allow nil display name"
     user.display_name = "12"
@@ -93,64 +95,67 @@ class UserTest < ActiveSupport::TestCase
            "new", "terms", "save", "confirm", "confirm-email",
            "go_public", "reset-password", "forgot-password", "suspended"]
     ok.each do |display_name|
-      user = users(:normal_user)
+      user = build(:user)
       user.display_name = display_name
       assert user.valid?, "#{display_name} is invalid, when it should be"
     end
 
     bad.each do |display_name|
-      user = users(:normal_user)
+      user = build(:user)
       user.display_name = display_name
       assert !user.valid?, "#{display_name} is valid when it shouldn't be"
     end
   end
 
-  def test_friend_with
+  def test_friends_with
-    create(:friend, :befriender => users(:normal_user), :befriendee => users(:public_user))
+    alice = create(:user, :active)
-    assert users(:normal_user).is_friends_with?(users(:public_user))
+    bob = create(:user, :active)
-    assert !users(:normal_user).is_friends_with?(users(:inactive_user))
+    charlie = create(:user, :active)
-    assert !users(:public_user).is_friends_with?(users(:normal_user))
+    create(:friend, :befriender => alice, :befriendee => bob)
-    assert !users(:public_user).is_friends_with?(users(:inactive_user))
+
-    assert !users(:inactive_user).is_friends_with?(users(:normal_user))
+    assert alice.is_friends_with?(bob)
-    assert !users(:inactive_user).is_friends_with?(users(:public_user))
+    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
+    alice = create(:user, :active, :home_lat => 51.0, :home_lon => 1.0, :data_public => false)
-    assert_equal [users(:public_user), users(:german_user)], users(:normal_user).nearby
+    bob = create(:user, :active, :home_lat => 51.1, :home_lon => 1.0, :data_public => true)
-    # second_user has normal user nearby, but normal user has their data private
+    charlie = create(:user, :active, :home_lat => 51.1, :home_lon => 1.1, :data_public => true)
-    assert_equal [users(:german_user)], users(:public_user).nearby
+    david = create(:user, :active, :home_lat => 10.0, :home_lon => -123.0, :data_public => true)
-    # inactive_user has no user nearby
+    _edward = create(:user, :suspended, :home_lat => 10.0, :home_lon => -123.0, :data_public => true)
-    assert_equal [], users(:inactive_user).nearby
+    south_pole_user = create(:user, :active, :home_lat => -90.0, :home_lon => 0.0, :data_public => true)
-    # north_pole_user has no user nearby, and doesn't throw exception
+    vagrant_user = create(:user, :active, :home_lat => nil, :home_lon => nil, :data_public => true)
-    assert_equal [], users(:north_pole_user).nearby
+
-    # confirmed_user has no home location
+    # bob and charlie are both near alice
-    assert_equal [], users(:confirmed_user).nearby
+    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
+  def test_friend_users
-    # normal user is a friend of second user
+    norm = create(:user, :active)
-    # it should be a one way friend associatation
+    sec = create(:user, :active)
-    norm = users(:normal_user)
-    sec = users(:public_user)
     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_equal [], sec.friend_users
-    assert !sec.is_friends_with?(norm)
+    assert_equal 0, sec.friend_users.size
-    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
   end
 
   def test_user_preferred_editor
-    user = users(:normal_user)
+    user = create(:user)
     assert_nil user.preferred_editor
     user.preferred_editor = "potlatch"
     assert_equal "potlatch", user.preferred_editor
@@ -161,32 +166,50 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_visible
-    assert_equal 23, User.visible.count
+    pending = create(:user, :pending)
+    active = create(:user, :active)
+    confirmed = create(:user, :confirmed)
+    suspended = create(:user, :suspended)
+    deleted = create(:user, :deleted)
+
+    assert User.visible.find(pending.id)
+    assert User.visible.find(active.id)
+    assert User.visible.find(confirmed.id)
     assert_raise ActiveRecord::RecordNotFound do
-      User.visible.find(users(:suspended_user).id)
+      User.visible.find(suspended.id)
     end
     assert_raise ActiveRecord::RecordNotFound do
-      User.visible.find(users(:deleted_user).id)
+      User.visible.find(deleted.id)
     end
   end
 
   def test_active
-    assert_equal 22, User.active.count
+    pending = create(:user, :pending)
+    active = create(:user, :active)
+    confirmed = create(:user, :confirmed)
+    suspended = create(:user, :suspended)
+    deleted = create(:user, :deleted)
+
+    assert User.active.find(active.id)
+    assert User.active.find(confirmed.id)
     assert_raise ActiveRecord::RecordNotFound do
-      User.active.find(users(:inactive_user).id)
+      User.active.find(pending.id)
     end
     assert_raise ActiveRecord::RecordNotFound do
-      User.active.find(users(:suspended_user).id)
+      User.active.find(suspended.id)
     end
     assert_raise ActiveRecord::RecordNotFound do
-      User.active.find(users(:deleted_user).id)
+      User.active.find(deleted.id)
     end
   end
 
   def test_identifiable
-    assert_equal 24, User.identifiable.count
+    public_user = create(:user, :data_public => true)
+    private_user = create(:user, :data_public => false)
+
+    assert User.identifiable.find(public_user.id)
     assert_raise ActiveRecord::RecordNotFound do
-      User.identifiable.find(users(:normal_user).id)
+      User.identifiable.find(private_user.id)
     end
   end
 
@@ -195,52 +218,52 @@ 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)
     assert_equal "de", user.preferred_language
     assert_equal %w(fr de sl), user.preferred_languages.map(&:to_s)
-    user = users(:public_user)
+    user = create(:user, :languages => %w(en de))
     assert_equal %w(en de), user.languages
   end
 
   def test_visible?
-    assert_equal true, users(:inactive_user).visible?
+    assert_equal true, build(:user, :pending).visible?
-    assert_equal true, users(:normal_user).visible?
+    assert_equal true, build(:user, :active).visible?
-    assert_equal true, users(:confirmed_user).visible?
+    assert_equal true, build(:user, :confirmed).visible?
-    assert_equal false, users(:suspended_user).visible?
+    assert_equal false, build(:user, :suspended).visible?
-    assert_equal false, users(:deleted_user).visible?
+    assert_equal false, build(:user, :deleted).visible?
   end
 
   def test_active?
-    assert_equal false, users(:inactive_user).active?
+    assert_equal false, build(:user, :pending).active?
-    assert_equal true, users(:normal_user).active?
+    assert_equal true, build(:user, :active).active?
-    assert_equal true, users(:confirmed_user).active?
+    assert_equal true, build(:user, :confirmed).active?
-    assert_equal false, users(:suspended_user).active?
+    assert_equal false, build(:user, :suspended).active?
-    assert_equal false, users(:deleted_user).active?
+    assert_equal false, build(:user, :deleted).active?
   end
 
   def test_moderator?
-    assert_equal false, users(:normal_user).moderator?
+    assert_equal false, create(:user).moderator?
-    assert_equal true, users(:moderator_user).moderator?
+    assert_equal true, create(:moderator_user).moderator?
   end
 
   def test_administrator?
-    assert_equal false, users(:normal_user).administrator?
+    assert_equal false, create(:user).administrator?
-    assert_equal true, users(:administrator_user).administrator?
+    assert_equal true, create(:administrator_user).administrator?
   end
 
   def test_has_role?
-    assert_equal false, users(:normal_user).has_role?("administrator")
+    assert_equal false, create(:user).has_role?("administrator")
-    assert_equal false, users(:normal_user).has_role?("moderator")
+    assert_equal false, create(:user).has_role?("moderator")
-    assert_equal true, users(:administrator_user).has_role?("administrator")
+    assert_equal true, create(:administrator_user).has_role?("administrator")
-    assert_equal true, users(:moderator_user).has_role?("moderator")
+    assert_equal true, create(:moderator_user).has_role?("moderator")
   end
 
   def test_delete
-    user = users(:normal_user)
+    user = create(:user, :with_home_location, :description => "foo")
     user.delete
     assert_equal "user_#{user.id}", user.display_name
     assert user.description.blank?
@@ -253,7 +276,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_to_xml
-    user = users(:normal_user)
+    user = build(:user, :with_home_location)
     xml = user.to_xml
     assert_select Nokogiri::XML::Document.parse(xml.to_s), "user" do
       assert_select "[display_name=?]", user.display_name
@@ -263,7 +286,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_to_xml_node
-    user = users(:normal_user)
+    user = build(:user, :with_home_location)
     xml = user.to_xml_node
     assert_select Nokogiri::XML::DocumentFragment.parse(xml.to_s), "user" do
       assert_select "[display_name=?]", user.display_name