Fixed tests broken by r11965.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11966 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
e978b3ace0
commit
07d88851bf
|
@ -136,6 +136,7 @@ class User < Principal
|
|||
@membership_by_project_id = nil
|
||||
@notified_projects_ids = nil
|
||||
@notified_projects_ids_changed = false
|
||||
@builtin_role = nil
|
||||
base_reload(*args)
|
||||
end
|
||||
|
||||
|
@ -444,11 +445,7 @@ class User < Principal
|
|||
|
||||
# Returns the user's bult-in role
|
||||
def builtin_role
|
||||
if logged?
|
||||
@role_non_member ||= Role.non_member
|
||||
else
|
||||
@role_anonymous ||= Role.anonymous
|
||||
end
|
||||
@builtin_role ||= (logged? ? Role.non_member : Role.anonymous)
|
||||
end
|
||||
|
||||
# Return user's roles for project
|
||||
|
|
|
@ -49,6 +49,7 @@ class SearchTest < ActiveSupport::TestCase
|
|||
|
||||
# Removes the :view_changesets permission from Anonymous role
|
||||
remove_permission Role.anonymous, :view_changesets
|
||||
User.current = nil
|
||||
|
||||
r = Issue.search(@issue_keyword).first
|
||||
assert r.include?(@issue)
|
||||
|
@ -74,6 +75,7 @@ class SearchTest < ActiveSupport::TestCase
|
|||
|
||||
# Removes the :view_changesets permission from Non member role
|
||||
remove_permission Role.non_member, :view_changesets
|
||||
User.current = User.find_by_login('rhill')
|
||||
|
||||
r = Issue.search(@issue_keyword).first
|
||||
assert r.include?(@issue)
|
||||
|
|
Loading…
Reference in New Issue