comparison test/functional/.svn/text-base/project_enumerations_controller_test.rb.svn-base @ 37:94944d00e43c

* Update to SVN trunk rev 4411
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 19 Nov 2010 13:24:41 +0000
parents 40f7cfd4df19
children af80e5618e9b 8661b858af72
comparison
equal deleted inserted replaced
22:40f7cfd4df19 37:94944d00e43c
18 "14"=>{"parent_id"=>"14", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"}, # Inactive Activity, Activate with custom value 18 "14"=>{"parent_id"=>"14", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"}, # Inactive Activity, Activate with custom value
19 "11"=>{"parent_id"=>"11", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"} # QA, no changes 19 "11"=>{"parent_id"=>"11", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"} # QA, no changes
20 } 20 }
21 21
22 assert_response :redirect 22 assert_response :redirect
23 assert_redirected_to 'projects/ecookbook/settings/activities' 23 assert_redirected_to '/projects/ecookbook/settings/activities'
24 24
25 # Created project specific activities... 25 # Created project specific activities...
26 project = Project.find('ecookbook') 26 project = Project.find('ecookbook')
27 27
28 # ... Design 28 # ... Design
81 project_activity.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # De-activate 81 project_activity.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # De-activate
82 project_activity_two.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"} # De-activate 82 project_activity_two.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"} # De-activate
83 } 83 }
84 84
85 assert_response :redirect 85 assert_response :redirect
86 assert_redirected_to 'projects/ecookbook/settings/activities' 86 assert_redirected_to '/projects/ecookbook/settings/activities'
87 87
88 # Created project specific activities... 88 # Created project specific activities...
89 project = Project.find('ecookbook') 89 project = Project.find('ecookbook')
90 assert_equal 2, project.time_entry_activities.count 90 assert_equal 2, project.time_entry_activities.count
91 91
157 }) 157 })
158 assert project_activity_two.save 158 assert project_activity_two.save
159 159
160 delete :destroy, :project_id => 1 160 delete :destroy, :project_id => 1
161 assert_response :redirect 161 assert_response :redirect
162 assert_redirected_to 'projects/ecookbook/settings/activities' 162 assert_redirected_to '/projects/ecookbook/settings/activities'
163 163
164 assert_nil TimeEntryActivity.find_by_id(project_activity.id) 164 assert_nil TimeEntryActivity.find_by_id(project_activity.id)
165 assert_nil TimeEntryActivity.find_by_id(project_activity_two.id) 165 assert_nil TimeEntryActivity.find_by_id(project_activity_two.id)
166 end 166 end
167 167
177 assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9]) 177 assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9])
178 assert 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size 178 assert 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size
179 179
180 delete :destroy, :project_id => 1 180 delete :destroy, :project_id => 1
181 assert_response :redirect 181 assert_response :redirect
182 assert_redirected_to 'projects/ecookbook/settings/activities' 182 assert_redirected_to '/projects/ecookbook/settings/activities'
183 183
184 assert_nil TimeEntryActivity.find_by_id(project_activity.id) 184 assert_nil TimeEntryActivity.find_by_id(project_activity.id)
185 assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size, "TimeEntries still assigned to project specific activity" 185 assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size, "TimeEntries still assigned to project specific activity"
186 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "TimeEntries still assigned to project specific activity" 186 assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(9, 1).size, "TimeEntries still assigned to project specific activity"
187 end 187 end