kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Jean-Philippe Lang 2013-06-12 21:55:39 +00:00
parent e978b3ace0
commit 07d88851bf
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/user.rb
View File

@ -136,6 +136,7 @@ class User < Principal
@membership_by_project_id = nil @membership_by_project_id = nil
@notified_projects_ids = nil @notified_projects_ids = nil
@notified_projects_ids_changed = false @notified_projects_ids_changed = false
@builtin_role = nil
base_reload(*args) base_reload(*args)
end end
@ -444,11 +445,7 @@ class User < Principal
# Returns the user's bult-in role # Returns the user's bult-in role
def builtin_role def builtin_role
if logged? @builtin_role ||= (logged? ? Role.non_member : Role.anonymous)
@role_non_member ||= Role.non_member
else
@role_anonymous ||= Role.anonymous
end
end end
# Return user's roles for project # Return user's roles for project

2
test/unit/search_test.rb
View File

@ -49,6 +49,7 @@ class SearchTest < ActiveSupport::TestCase
# Removes the :view_changesets permission from Anonymous role # Removes the :view_changesets permission from Anonymous role
remove_permission Role.anonymous, :view_changesets remove_permission Role.anonymous, :view_changesets
User.current = nil
r = Issue.search(@issue_keyword).first r = Issue.search(@issue_keyword).first
assert r.include?(@issue) assert r.include?(@issue)
@ -74,6 +75,7 @@ class SearchTest < ActiveSupport::TestCase
# Removes the :view_changesets permission from Non member role # Removes the :view_changesets permission from Non member role
remove_permission Role.non_member, :view_changesets remove_permission Role.non_member, :view_changesets
User.current = User.find_by_login('rhill')
r = Issue.search(@issue_keyword).first r = Issue.search(@issue_keyword).first
assert r.include?(@issue) assert r.include?(@issue)