Adds links to locked users when current user is admin.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10673 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
50037b18c4
commit
7729178d9d
6 files changed
+38
-9
No files matched your search
@@ -114,6 +114,15 @@ class ActiveSupport::TestCase
|
||||
saved_settings.each {|k, v| Setting[k] = v} if saved_settings
|
||||
end
|
||||
|
||||
# Yields the block with user as the current user
|
||||
def with_current_user(user, &block)
|
||||
saved_user = User.current
|
||||
User.current = user
|
||||
yield
|
||||
ensure
|
||||
User.current = saved_user
|
||||
end
|
||||
|
||||
def change_user_password(login, new_password)
|
||||
user = User.first(:conditions => {:login => login})
|
||||
user.password, user.password_confirmation = new_password, new_password
|
||||
|
||||
@@ -1010,15 +1010,23 @@ RAW
|
||||
|
||||
def test_link_to_user
|
||||
user = User.find(2)
|
||||
t = link_to_user(user)
|
||||
assert_equal "<a href=\"/users/2\">#{ user.name }</a>", t
|
||||
assert_equal '<a href="/users/2" class="user active">John Smith</a>', link_to_user(user)
|
||||
end
|
||||
|
||||
def test_link_to_user_should_not_link_to_locked_user
|
||||
user = User.find(5)
|
||||
assert user.locked?
|
||||
t = link_to_user(user)
|
||||
assert_equal user.name, t
|
||||
with_current_user nil do
|
||||
user = User.find(5)
|
||||
assert user.locked?
|
||||
assert_equal 'Dave2 Lopper2', link_to_user(user)
|
||||
end
|
||||
end
|
||||
|
||||
def test_link_to_user_should_link_to_locked_user_if_current_user_is_admin
|
||||
with_current_user User.find(1) do
|
||||
user = User.find(5)
|
||||
assert user.locked?
|
||||
assert_equal '<a href="/users/5" class="user locked">Dave2 Lopper2</a>', link_to_user(user)
|
||||
end
|
||||
end
|
||||
|
||||
def test_link_to_user_should_not_link_to_anonymous
|
||||
|
||||
Reference in new issue
Block a user