summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-10-15 11:42:32 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-10-15 11:42:32 +0000
commitf793340077d0acb9fb8724122f8b49160e78a69c (patch)
tree749fc3430e1680e23948d538e137bdb73fb8174d /test
parente3fafdb6aa737ab83760698671e9c91271da27d3 (diff)
downloadredmine-f793340077d0acb9fb8724122f8b49160e78a69c.tar.gz
redmine-f793340077d0acb9fb8724122f8b49160e78a69c.zip
Merged r16997 (#26667).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16998 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/functional/queries_controller_test.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 4aac31540..6f3e3f664 100644
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -567,4 +567,19 @@ class QueriesControllerTest < Redmine::ControllerTest
json = ActiveSupport::JSON.decode(response.body)
assert_include ["OnlineStore - Systemwide visible version", "7", "open"], json
end
+
+ def test_subproject_filter_time_entries_with_project_id_should_return_filter_values
+ @request.session[:user_id] = 2
+ get :filter, :params => {
+ :project_id => 1,
+ :type => 'TimeEntryQuery',
+ :name => 'subproject_id'
+ }
+
+ assert_response :success
+ assert_equal 'application/json', response.content_type
+ json = ActiveSupport::JSON.decode(response.body)
+ assert_equal 4, json.count
+ assert_include ["Private child of eCookbook","5"], json
+ end
end