@@ -153,7 +153,7 class ProjectEnumerationsControllerTest < ActionController::TestCase | |||
|
153 | 153 | # second one is a dupicate |
|
154 | 154 | parent = TimeEntryActivity.find(9) |
|
155 | 155 | TimeEntryActivity.create!({:name => parent.name, :project_id => 1, |
|
156 | :position => parent.position, :active => true}) | |
|
156 | :position => parent.position, :active => true, :parent_id => 9}) | |
|
157 | 157 | TimeEntry.create!({:project_id => 1, :hours => 1.0, :user => User.find(1), |
|
158 | 158 | :issue_id => 3, :activity_id => 10, :spent_on => '2009-01-01'}) |
|
159 | 159 | assert_equal 3, TimeEntry.where(:activity_id => 9, :project_id => 1).count |
@@ -113,7 +113,7 class TimelogControllerTest < ActionController::TestCase | |||
|
113 | 113 | def test_get_edit_with_an_existing_time_entry_with_inactive_activity |
|
114 | 114 | te = TimeEntry.find(1) |
|
115 | 115 | te.activity = TimeEntryActivity.find_by_name("Inactive Activity") |
|
116 | te.save! | |
|
116 | te.save!(:validate => false) | |
|
117 | 117 | |
|
118 | 118 | @request.session[:user_id] = 1 |
|
119 | 119 | get :edit, :project_id => 1, :id => 1 |
@@ -105,13 +105,13 class TimeEntryActivityTest < ActiveSupport::TestCase | |||
|
105 | 105 | |
|
106 | 106 | def test_destroying_a_system_activity_should_reassign_children_activities |
|
107 | 107 | project = Project.generate! |
|
108 | entries = [] | |
|
109 | ||
|
108 | 110 | system_activity = TimeEntryActivity.create!(:name => 'Activity') |
|
111 | entries << TimeEntry.generate!(:project => project, :activity => system_activity) | |
|
112 | ||
|
109 | 113 | project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id) |
|
110 | ||
|
111 | entries = [ | |
|
112 | TimeEntry.generate!(:project => project, :activity => system_activity), | |
|
113 | TimeEntry.generate!(:project => project, :activity => project_activity) | |
|
114 | ] | |
|
114 | entries << TimeEntry.generate!(:project => project.reload, :activity => project_activity) | |
|
115 | 115 | |
|
116 | 116 | assert_difference 'TimeEntryActivity.count', -2 do |
|
117 | 117 | assert_nothing_raised do |
@@ -30,9 +30,9 class TimeEntryQueryTest < ActiveSupport::TestCase | |||
|
30 | 30 | def test_activity_filter_should_consider_system_and_project_activities |
|
31 | 31 | TimeEntry.delete_all |
|
32 | 32 | system = TimeEntryActivity.create!(:name => 'Foo') |
|
33 | TimeEntry.generate!(:activity => system, :hours => 1.0) | |
|
33 | 34 | override = TimeEntryActivity.create!(:name => 'Foo', :parent_id => system.id, :project_id => 1) |
|
34 | 35 | other = TimeEntryActivity.create!(:name => 'Bar') |
|
35 | TimeEntry.generate!(:activity => system, :hours => 1.0) | |
|
36 | 36 | TimeEntry.generate!(:activity => override, :hours => 2.0) |
|
37 | 37 | TimeEntry.generate!(:activity => other, :hours => 4.0) |
|
38 | 38 |
General Comments 0
You need to be logged in to leave comments.
Login now