summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-06-03 03:45:06 +0000
committerGo MAEDA <maeda@farend.jp>2018-06-03 03:45:06 +0000
commit24c33c14a1469572dc225e78e5c6b8baff36afb7 (patch)
tree5ac6c12f1f8f1a55fc303bf24a5bbd0da8fc45d4
parent0ab0f937867510739ba382dbbe0aca44d9d1d8e2 (diff)
downloadredmine-24c33c14a1469572dc225e78e5c6b8baff36afb7.tar.gz
redmine-24c33c14a1469572dc225e78e5c6b8baff36afb7.zip
merged r17362 from trunk to 3.4-stable (#28693).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17363 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/projects_controller_test.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index f243af92c..20dfaf474 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -663,18 +663,19 @@ class ProjectsControllerTest < Redmine::ControllerTest
def test_settings_should_show_tabs_depending_on_permission
@request.session[:user_id] = 3
- role = User.find(3).roles.first
+ project = Project.find(1)
+ role = User.find(3).roles_for_project(project).first
role.permissions = []
role.save
get :settings, :params => {
- :id => 'ecookbook'
+ :id => project.id
}
assert_response 403
role.add_permission! :manage_repository, :manage_boards, :manage_project_activities
get :settings, :params => {
- :id => 'ecookbook'
+ :id => project.id
}
assert_response :success
assert_select 'a[id^=tab-]', 3