From 48d40a8c8884aefc2287f2030c439578057c9516 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 30 May 2015 10:05:43 +0000 Subject: Fixed that project activity without parent hides system activities and removed duplicated code. git-svn-id: http://svn.redmine.org/redmine/trunk@14292 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/time_entry_activity_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'test') diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb index 8c6fef7aa..645f7474a 100644 --- a/test/unit/time_entry_activity_test.rb +++ b/test/unit/time_entry_activity_test.rb @@ -120,4 +120,11 @@ class TimeEntryActivityTest < ActiveSupport::TestCase end assert entries.all? {|entry| entry.reload.activity.name == 'Development'} end + + def test_project_activity_without_parent_should_not_disable_system_activities + project = Project.find(1) + activity = TimeEntryActivity.create!(:name => 'Csutom', :project => project) + assert_include activity, project.activities + assert_include TimeEntryActivity.find(9), project.activities + end end -- cgit v1.2.3