##// END OF EJS Templates
Merged r14508 (#20512)....
Jean-Philippe Lang -
r14175:e7a3b1f0930a
parent child
Show More
@@ -739,7 +739,7 class Project < ActiveRecord::Base
739 # clear unique attributes
739 # clear unique attributes
740 attributes = project.attributes.dup.except('id', 'name', 'identifier', 'status', 'parent_id', 'lft', 'rgt')
740 attributes = project.attributes.dup.except('id', 'name', 'identifier', 'status', 'parent_id', 'lft', 'rgt')
741 copy = Project.new(attributes)
741 copy = Project.new(attributes)
742 copy.enabled_modules = project.enabled_modules
742 copy.enabled_module_names = project.enabled_module_names
743 copy.trackers = project.trackers
743 copy.trackers = project.trackers
744 copy.custom_values = project.custom_values.collect {|v| v.clone}
744 copy.custom_values = project.custom_values.collect {|v| v.clone}
745 copy.issue_custom_fields = project.issue_custom_fields
745 copy.issue_custom_fields = project.issue_custom_fields
@@ -723,13 +723,26 class ProjectTest < ActiveSupport::TestCase
723
723
724 # Duplicated attributes
724 # Duplicated attributes
725 assert_equal source_project.description, copied_project.description
725 assert_equal source_project.description, copied_project.description
726 assert_equal source_project.enabled_modules, copied_project.enabled_modules
727 assert_equal source_project.trackers, copied_project.trackers
726 assert_equal source_project.trackers, copied_project.trackers
728
727
729 # Default attributes
728 # Default attributes
730 assert_equal 1, copied_project.status
729 assert_equal 1, copied_project.status
731 end
730 end
732
731
732 def test_copy_from_should_copy_enabled_modules
733 source = Project.generate!
734 source.enabled_module_names = %w(issue_tracking wiki)
735
736 copy = Project.copy_from(source)
737 copy.name = 'Copy'
738 copy.identifier = 'copy'
739 assert_difference 'EnabledModule.count', 2 do
740 copy.save!
741 end
742 assert_equal 2, copy.reload.enabled_modules.count
743 assert_equal 2, source.reload.enabled_modules.count
744 end
745
733 def test_activities_should_use_the_system_activities
746 def test_activities_should_use_the_system_activities
734 project = Project.find(1)
747 project = Project.find(1)
735 assert_equal project.activities.to_a, TimeEntryActivity.where(:active => true).to_a
748 assert_equal project.activities.to_a, TimeEntryActivity.where(:active => true).to_a
General Comments 0
You need to be logged in to leave comments. Login now