From ff2532e52d406bb29509ee63b8329a70ddfc5c52 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 30 May 2015 09:41:58 +0000 Subject: Fixed test failures introduced by r14288 (#19656). git-svn-id: http://svn.redmine.org/redmine/trunk@14291 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/time_entry_activity_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/unit/time_entry_activity_test.rb') diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb index ab3a03530..8c6fef7aa 100644 --- a/test/unit/time_entry_activity_test.rb +++ b/test/unit/time_entry_activity_test.rb @@ -105,13 +105,13 @@ class TimeEntryActivityTest < ActiveSupport::TestCase def test_destroying_a_system_activity_should_reassign_children_activities project = Project.generate! + entries = [] + 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, :activity => system_activity), - TimeEntry.generate!(:project => project, :activity => project_activity) - ] + entries << TimeEntry.generate!(:project => project.reload, :activity => project_activity) assert_difference 'TimeEntryActivity.count', -2 do assert_nothing_raised do -- cgit v1.2.3