##// END OF EJS Templates
Merged r5265 from trunk....
Jean-Philippe Lang -
r5462:6153d5ab833c
parent child
Show More
@@ -509,10 +509,7 class Project < ActiveRecord::Base
509 509 def enabled_module_names=(module_names)
510 510 if module_names && module_names.is_a?(Array)
511 511 module_names = module_names.collect(&:to_s).reject(&:blank?)
512 # remove disabled modules
513 enabled_modules.each {|mod| mod.destroy unless module_names.include?(mod.name)}
514 # add new modules
515 module_names.reject {|name| module_enabled?(name)}.each {|name| enabled_modules << EnabledModule.new(:name => name)}
512 self.enabled_modules = module_names.collect {|name| enabled_modules.detect {|mod| mod.name == name} || EnabledModule.new(:name => name)}
516 513 else
517 514 enabled_modules.clear
518 515 end
@@ -288,6 +288,22 class ProjectsControllerTest < ActionController::TestCase
288 288 end
289 289 end
290 290
291 def test_create_should_preserve_modules_on_validation_failure
292 with_settings :default_projects_modules => ['issue_tracking', 'repository'] do
293 @request.session[:user_id] = 1
294 assert_no_difference 'Project.count' do
295 post :create, :project => {
296 :name => "blog",
297 :identifier => "",
298 :enabled_module_names => %w(issue_tracking news)
299 }
300 end
301 assert_response :success
302 project = assigns(:project)
303 assert_equal %w(issue_tracking news), project.enabled_module_names.sort
304 end
305 end
306
291 307 def test_create_should_not_accept_get
292 308 @request.session[:user_id] = 1
293 309 get :create
@@ -553,6 +553,14 class ProjectTest < ActiveSupport::TestCase
553 553 assert_nil Project.next_identifier
554 554 end
555 555
556 def test_enabled_module_names
557 with_settings :default_projects_modules => ['issue_tracking', 'repository'] do
558 project = Project.new
559
560 project.enabled_module_names = %w(issue_tracking news)
561 assert_equal %w(issue_tracking news), project.enabled_module_names.sort
562 end
563 end
556 564
557 565 def test_enabled_module_names_should_not_recreate_enabled_modules
558 566 project = Project.find(1)
General Comments 0
You need to be logged in to leave comments. Login now