dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Role-based issue custom field visibility (#5037).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12012 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-07-13 09:20:11 +00:00
parent a74d55edd9
commit 628d05629b
41 changed files with 953 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unit/custom_field_test.rb
+38
View File
@@ -241,4 +241,42 @@ class CustomFieldTest < ActiveSupport::TestCase
field = CustomField.find(1)
assert_equal 'PostgreSQL', field.value_from_keyword('postgresql', Issue.find(1))
end
def test_visibile_scope_with_admin_should_return_all_custom_fields
CustomField.delete_all
fields = [
CustomField.generate!(:visible => true),
CustomField.generate!(:visible => false),
CustomField.generate!(:visible => false, :role_ids => [1, 3]),
CustomField.generate!(:visible => false, :role_ids => [1, 2]),
]
assert_equal 4, CustomField.visible(User.find(1)).count
end
def test_visibile_scope_with_non_admin_user_should_return_visible_custom_fields
CustomField.delete_all
fields = [
CustomField.generate!(:visible => true),
CustomField.generate!(:visible => false),
CustomField.generate!(:visible => false, :role_ids => [1, 3]),
CustomField.generate!(:visible => false, :role_ids => [1, 2]),
]
user = User.generate!
User.add_to_project(user, Project.first, Role.find(3))
assert_equal [fields[0], fields[2]], CustomField.visible(user).order("id").to_a
end
def test_visibile_scope_with_anonymous_user_should_return_visible_custom_fields
CustomField.delete_all
fields = [
CustomField.generate!(:visible => true),
CustomField.generate!(:visible => false),
CustomField.generate!(:visible => false, :role_ids => [1, 3]),
CustomField.generate!(:visible => false, :role_ids => [1, 2]),
]
assert_equal [fields[0]], CustomField.visible(User.anonymous).order("id").to_a
end
end
test/unit/issue_custom_field_test.rb
+42
View File
@@ -0,0 +1,42 @@
# Redmine - project management software
# Copyright (C) 2006-2013 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require File.expand_path('../../test_helper', __FILE__)
class IssueCustomFieldTest < ActiveSupport::TestCase
include Redmine::I18n
fixtures :roles
def test_custom_field_with_visible_set_to_false_should_validate_roles
set_language_if_valid 'en'
field = IssueCustomField.new(:name => 'Field', :field_format => 'string', :visible => false)
assert !field.save
assert_include "Roles can't be blank", field.errors.full_messages
field.role_ids = [1, 2]
assert field.save
end
def test_changing_visible_to_true_should_clear_roles
field = IssueCustomField.create!(:name => 'Field', :field_format => 'string', :visible => false, :role_ids => [1, 2])
assert_equal 2, field.roles.count
field.visible = true
field.save!
assert_equal 0, field.roles.count
end
end
test/unit/lib/redmine/hook_test.rb
+2 -2
View File
@@ -154,14 +154,14 @@ class Redmine::Hook::ManagerTest < ActionView::TestCase
issue = Issue.find(1)
ActionMailer::Base.deliveries.clear
Mailer.issue_add(issue).deliver
Mailer.deliver_issue_add(issue)
mail = ActionMailer::Base.deliveries.last
@hook_module.add_listener(TestLinkToHook)
hook_helper.call_hook(:view_layouts_base_html_head)
ActionMailer::Base.deliveries.clear
Mailer.issue_add(issue).deliver
Mailer.deliver_issue_add(issue)
mail2 = ActionMailer::Base.deliveries.last
assert_equal mail_body(mail), mail_body(mail2)
test/unit/mailer_test.rb
+32 -30
View File
@@ -42,7 +42,7 @@ class MailerTest < ActiveSupport::TestCase
Setting.protocol = 'https'
journal = Journal.find(3)
assert Mailer.issue_edit(journal).deliver
assert Mailer.deliver_issue_edit(journal)
mail = last_email
assert_not_nil mail
@@ -81,7 +81,7 @@ class MailerTest < ActiveSupport::TestCase
Setting.protocol = 'http'
journal = Journal.find(3)
assert Mailer.issue_edit(journal).deliver
assert Mailer.deliver_issue_edit(journal)
mail = last_email
assert_not_nil mail
@@ -121,7 +121,7 @@ class MailerTest < ActiveSupport::TestCase
Redmine::Utils.relative_url_root = nil
journal = Journal.find(3)
assert Mailer.issue_edit(journal).deliver
assert Mailer.deliver_issue_edit(journal)
mail = last_email
assert_not_nil mail
@@ -158,7 +158,7 @@ class MailerTest < ActiveSupport::TestCase
def test_email_headers
issue = Issue.find(1)
Mailer.issue_add(issue).deliver
Mailer.deliver_issue_add(issue)
mail = last_email
assert_not_nil mail
assert_equal 'OOF', mail.header['X-Auto-Response-Suppress'].to_s
@@ -168,7 +168,7 @@ class MailerTest < ActiveSupport::TestCase
def test_email_headers_should_include_sender
issue = Issue.find(1)
Mailer.issue_add(issue).deliver
Mailer.deliver_issue_add(issue)
mail = last_email
assert_equal issue.author.login, mail.header['X-Redmine-Sender'].to_s
end
@@ -176,7 +176,7 @@ class MailerTest < ActiveSupport::TestCase
def test_plain_text_mail
Setting.plain_text_mail = 1
journal = Journal.find(2)
Mailer.issue_edit(journal).deliver
Mailer.deliver_issue_edit(journal)
mail = last_email
assert_equal "text/plain; charset=UTF-8", mail.content_type
assert_equal 0, mail.parts.size
@@ -186,7 +186,7 @@ class MailerTest < ActiveSupport::TestCase
def test_html_mail
Setting.plain_text_mail = 0
journal = Journal.find(2)
Mailer.issue_edit(journal).deliver
Mailer.deliver_issue_edit(journal)
mail = last_email
assert_equal 2, mail.parts.size
assert mail.encoded.include?('href')
@@ -231,19 +231,21 @@ class MailerTest < ActiveSupport::TestCase
end
def test_issue_add_message_id
issue = Issue.find(1)
Mailer.issue_add(issue).deliver
issue = Issue.find(2)
Mailer.deliver_issue_add(issue)
mail = last_email
assert_equal Mailer.message_id_for(issue), mail.message_id
assert_nil mail.references
assert_match /^redmine\.issue-2\.20060719190421\.[a-f0-9]+@example\.net/, mail.message_id
assert_include "redmine.issue-2.20060719190421@example.net", mail.references
end
def test_issue_edit_message_id
journal = Journal.find(1)
Mailer.issue_edit(journal).deliver
journal = Journal.find(3)
journal.issue = Issue.find(2)
Mailer.deliver_issue_edit(journal)
mail = last_email
assert_equal Mailer.message_id_for(journal), mail.message_id
assert_include Mailer.message_id_for(journal.issue), mail.references
assert_match /^redmine\.journal-3\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
assert_include "redmine.issue-2.20060719190421@example.net", mail.references
assert_select_email do
# link to the update
assert_select "a[href=?]",
@@ -255,8 +257,8 @@ class MailerTest < ActiveSupport::TestCase
message = Message.find(1)
Mailer.message_posted(message).deliver
mail = last_email
assert_equal Mailer.message_id_for(message), mail.message_id
assert_nil mail.references
assert_match /^redmine\.message-1\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
assert_include "redmine.message-1.20070512151532@example.net", mail.references
assert_select_email do
# link to the message
assert_select "a[href=?]",
@@ -269,8 +271,8 @@ class MailerTest < ActiveSupport::TestCase
message = Message.find(3)
Mailer.message_posted(message).deliver
mail = last_email
assert_equal Mailer.message_id_for(message), mail.message_id
assert_include Mailer.message_id_for(message.parent), mail.references
assert_match /^redmine\.message-3\.\d+\.[a-f0-9]+@example\.net/, mail.message_id
assert_include "redmine.message-1.20070512151532@example.net", mail.references
assert_select_email do
# link to the reply
assert_select "a[href=?]",
@@ -281,14 +283,14 @@ class MailerTest < ActiveSupport::TestCase
test "#issue_add should notify project members" do
issue = Issue.find(1)
assert Mailer.issue_add(issue).deliver
assert Mailer.deliver_issue_add(issue)
assert last_email.bcc.include?('dlopper@somenet.foo')
end
test "#issue_add should not notify project members that are not allow to view the issue" do
issue = Issue.find(1)
Role.find(2).remove_permission!(:view_issues)
assert Mailer.issue_add(issue).deliver
assert Mailer.deliver_issue_add(issue)
assert !last_email.bcc.include?('dlopper@somenet.foo')
end
@@ -302,7 +304,7 @@ class MailerTest < ActiveSupport::TestCase
user.save
Watcher.create!(:watchable => issue, :user => user)
assert Mailer.issue_add(issue).deliver
assert Mailer.deliver_issue_add(issue)
assert last_email.bcc.include?(user.mail)
end
@@ -311,7 +313,7 @@ class MailerTest < ActiveSupport::TestCase
user = User.find(9)
Watcher.create!(:watchable => issue, :user => user)
Role.non_member.remove_permission!(:view_issues)
assert Mailer.issue_add(issue).deliver
assert Mailer.deliver_issue_add(issue)
assert !last_email.bcc.include?(user.mail)
end
@@ -320,7 +322,7 @@ class MailerTest < ActiveSupport::TestCase
issue = Issue.find(1)
valid_languages.each do |lang|
Setting.default_language = lang.to_s
assert Mailer.issue_add(issue).deliver
assert Mailer.deliver_issue_add(issue)
end
end
@@ -328,7 +330,7 @@ class MailerTest < ActiveSupport::TestCase
journal = Journal.find(1)
valid_languages.each do |lang|
Setting.default_language = lang.to_s
assert Mailer.issue_edit(journal).deliver
assert Mailer.deliver_issue_edit(journal)
end
end
@@ -338,11 +340,11 @@ class MailerTest < ActiveSupport::TestCase
journal.save!
Role.find(2).add_permission! :view_private_notes
Mailer.issue_edit(journal).deliver
Mailer.deliver_issue_edit(journal)
assert_equal %w(dlopper@somenet.foo jsmith@somenet.foo), ActionMailer::Base.deliveries.last.bcc.sort
Role.find(2).remove_permission! :view_private_notes
Mailer.issue_edit(journal).deliver
Mailer.deliver_issue_edit(journal)
assert_equal %w(jsmith@somenet.foo), ActionMailer::Base.deliveries.last.bcc.sort
end
@@ -353,11 +355,11 @@ class MailerTest < ActiveSupport::TestCase
journal.save!
Role.non_member.add_permission! :view_private_notes
Mailer.issue_edit(journal).deliver
Mailer.deliver_issue_edit(journal)
assert_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort
Role.non_member.remove_permission! :view_private_notes
Mailer.issue_edit(journal).deliver
Mailer.deliver_issue_edit(journal)
assert_not_include 'someone@foo.bar', ActionMailer::Base.deliveries.last.bcc.sort
end
@@ -367,7 +369,7 @@ class MailerTest < ActiveSupport::TestCase
journal.save!
with_settings :default_language => 'en' do
Mailer.issue_edit(journal).deliver
Mailer.deliver_issue_edit(journal)
end
assert_mail_body_match '(Private notes)', last_email
end
test/unit/query_test.rb
+22
View File
@@ -1201,6 +1201,28 @@ class QueryTest < ActiveSupport::TestCase
assert ! query.available_filters["assigned_to_role"][:values].include?(['Anonymous','5'])
end
def test_available_filters_should_include_custom_field_according_to_user_visibility
visible_field = IssueCustomField.generate!(:is_for_all => true, :is_filter => true, :visible => true)
hidden_field = IssueCustomField.generate!(:is_for_all => true, :is_filter => true, :visible => false, :role_ids => [1])
with_current_user User.find(3) do
query = IssueQuery.new
assert_include "cf_#{visible_field.id}", query.available_filters.keys
assert_not_include "cf_#{hidden_field.id}", query.available_filters.keys
end
end
def test_available_columns_should_include_custom_field_according_to_user_visibility
visible_field = IssueCustomField.generate!(:is_for_all => true, :is_filter => true, :visible => true)
hidden_field = IssueCustomField.generate!(:is_for_all => true, :is_filter => true, :visible => false, :role_ids => [1])
with_current_user User.find(3) do
query = IssueQuery.new
assert_include :"cf_#{visible_field.id}", query.available_columns.map(&:name)
assert_not_include :"cf_#{hidden_field.id}", query.available_columns.map(&:name)
end
end
context "#statement" do
context "with 'member_of_group' filter" do
setup do