summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-20 11:38:20 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-01-20 11:38:20 +0000
commit48fb02e3839c30667733e59415d98c373467876b (patch)
treee7fbabd25d1f5e1c2cc3a55d1c5bddc45dcc70e1 /test
parent26016cdc086ad61075512414e72b3f3b9b6d8069 (diff)
downloadredmine-48fb02e3839c30667733e59415d98c373467876b.tar.gz
redmine-48fb02e3839c30667733e59415d98c373467876b.zip
Split "Manage documents" permission into create, edit and delete permissions (#12401).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11206 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/fixtures/roles.yml13
-rw-r--r--test/unit/user_test.rb2
2 files changed, 10 insertions, 5 deletions
diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index 1cacf0100..2f1e57804 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -38,7 +38,9 @@ roles_001:
- :manage_news
- :comment_news
- :view_documents
- - :manage_documents
+ - :add_documents
+ - :edit_documents
+ - :delete_documents
- :view_wiki_pages
- :export_wiki_pages
- :view_wiki_edits
@@ -89,7 +91,9 @@ roles_002:
- :manage_news
- :comment_news
- :view_documents
- - :manage_documents
+ - :add_documents
+ - :edit_documents
+ - :delete_documents
- :view_wiki_pages
- :view_wiki_edits
- :edit_wiki_pages
@@ -131,7 +135,9 @@ roles_003:
- :manage_news
- :comment_news
- :view_documents
- - :manage_documents
+ - :add_documents
+ - :edit_documents
+ - :delete_documents
- :view_wiki_pages
- :view_wiki_edits
- :edit_wiki_pages
@@ -163,7 +169,6 @@ roles_004:
- :view_time_entries
- :comment_news
- :view_documents
- - :manage_documents
- :view_wiki_pages
- :view_wiki_edits
- :edit_wiki_pages
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 7f43cbc82..bf74dd6da 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -901,7 +901,7 @@ class UserTest < ActiveSupport::TestCase
should "authorize nearly everything for admin users" do
project = Project.find(1)
assert ! @admin.member_of?(project)
- %w(edit_issues delete_issues manage_news manage_documents manage_wiki).each do |p|
+ %w(edit_issues delete_issues manage_news add_documents manage_wiki).each do |p|
assert_equal true, @admin.allowed_to?(p.to_sym, project)
end
end