summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-09-30 18:03:13 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-09-30 18:03:13 +0000
commit44644679908ca0d292a9aa5113d5d93d2aa754f6 (patch)
treef5304232e63ed9d7fa016f0a81b1279532c2ab42 /test
parent2d78003c87099fb6a832025027701e9456727727 (diff)
downloadredmine-44644679908ca0d292a9aa5113d5d93d2aa754f6.tar.gz
redmine-44644679908ca0d292a9aa5113d5d93d2aa754f6.zip
Include inactive activities in time entries filter (#20117).
git-svn-id: http://svn.redmine.org/redmine/trunk@14626 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/unit/time_entry_query_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/test/unit/time_entry_query_test.rb b/test/unit/time_entry_query_test.rb
index 64b64107a..f02b4e7c5 100644
--- a/test/unit/time_entry_query_test.rb
+++ b/test/unit/time_entry_query_test.rb
@@ -27,6 +27,16 @@ class TimeEntryQueryTest < ActiveSupport::TestCase
:groups_users,
:enabled_modules
+ def test_cross_project_activity_filter_should_propose_non_active_activities
+ activity = TimeEntryActivity.create!(:name => 'Disabled', :active => false)
+ assert !activity.active?
+
+ query = TimeEntryQuery.new(:name => '_')
+ assert options = query.available_filters['activity_id']
+ assert values = options[:values]
+ assert_include ["Disabled", activity.id.to_s], values
+ end
+
def test_activity_filter_should_consider_system_and_project_activities
TimeEntry.delete_all
system = TimeEntryActivity.create!(:name => 'Foo')