From 04d4a1a191c46e4595ed455372e86c66cf3f6ed7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 16 Nov 2019 09:43:42 +0000 Subject: Merged r16196 to 3.3-stable (#15773). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@19074 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/query_test.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'test/unit') diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 54b96ea40..a4dd961ec 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -1820,4 +1820,21 @@ class QueryTest < ActiveSupport::TestCase ActiveRecord::Base.default_timezone = :local # restore Redmine default end + def test_filter_on_subprojects + query = IssueQuery.new(:name => '_', :project => Project.find(1)) + filter_name = "subproject_id" + assert_include filter_name, query.available_filters.keys + + # "is" operator should include issues of parent project + issues of the selected subproject + query.filters = {filter_name => {:operator => '=', :values => ['3']}} + issues = find_issues_with_query(query) + assert_equal [1, 2, 3, 5, 7, 8, 11, 12, 13, 14], issues.map(&:id).sort + + # "is not" operator should include issues of parent project + issues of all active subprojects - issues of the selected subprojects + query = IssueQuery.new(:name => '_', :project => Project.find(1)) + query.filters = {filter_name => {:operator => '!', :values => ['3']}} + issues = find_issues_with_query(query) + assert_equal [1, 2, 3, 6, 7, 8, 9, 10, 11, 12], issues.map(&:id).sort + end + end -- cgit v1.2.3