Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Fixed test failures introduced by r14288 (#19656).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14291 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-05-30 09:41:58 +00:00
parent 78384d147a
commit ff2532e52d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/unit/time_entry_activity_test.rb
View File

@@ -105,13 +105,13 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
def test_destroying_a_system_activity_should_reassign_children_activities
project = Project.generate!
system_activity = TimeEntryActivity.create!(:name => 'Activity')
project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
entries = []
entries = [
TimeEntry.generate!(:project => project, :activity => system_activity),
TimeEntry.generate!(:project => project, :activity => project_activity)
]
system_activity = TimeEntryActivity.create!(:name => 'Activity')
entries << TimeEntry.generate!(:project => project, :activity => system_activity)
project_activity = TimeEntryActivity.create!(:name => 'Activity', :project => project, :parent_id => system_activity.id)
entries << TimeEntry.generate!(:project => project.reload, :activity => project_activity)
assert_difference 'TimeEntryActivity.count', -2 do
assert_nothing_raised do