summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/projects_controller_test.rb11
-rw-r--r--test/object_helpers.rb5
2 files changed, 15 insertions, 1 deletions
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index cfc93face..b711d5e1e 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -495,6 +495,17 @@ class ProjectsControllerTest < ActionController::TestCase
assert_equal 'eCookbook', Project.find(1).name
end
+ def test_update_child_project_without_parent_permission_should_not_show_validation_error
+ child = Project.generate_with_parent!
+ user = User.generate!
+ User.add_to_project(user, child, Role.generate!(:permissions => [:edit_project]))
+ @request.session[:user_id] = user.id
+
+ post :update, :id => child.id, :project => {:name => 'Updated'}
+ assert_response 302
+ assert_match /Successful update/, flash[:notice]
+ end
+
def test_modules
@request.session[:user_id] = 2
Project.find(1).enabled_module_names = ['issue_tracking', 'news']
diff --git a/test/object_helpers.rb b/test/object_helpers.rb
index 82d8d20fc..905ab0998 100644
--- a/test/object_helpers.rb
+++ b/test/object_helpers.rb
@@ -39,7 +39,10 @@ module ObjectHelpers
project
end
- def Project.generate_with_parent!(parent, attributes={})
+ def Project.generate_with_parent!(*args)
+ attributes = args.last.is_a?(Hash) ? args.pop : {}
+ parent = args.size > 0 ? args.first : Project.generate!
+
project = Project.generate!(attributes) do |p|
p.parent = parent
end