@@ -30,18 +30,20 class QueriesHelperTest < ActionView::TestCase | |||||
30 | :custom_fields_trackers |
|
30 | :custom_fields_trackers | |
31 |
|
31 | |||
32 | def test_filters_options_should_be_ordered |
|
32 | def test_filters_options_should_be_ordered | |
33 | User.current = User.find_by_login('admin') |
|
33 | set_language_if_valid 'en' | |
34 |
query = IssueQuery.new |
|
34 | query = IssueQuery.new | |
35 |
|
|
35 | filter_count = query.available_filters.size | |
36 | fo = filters_options(query) |
|
36 | fo = filters_options(query) | |
37 |
assert_equal |
|
37 | assert_equal filter_count + 1, fo.size | |
38 | assert_equal [], fo[0] |
|
38 | assert_equal [], fo[0] | |
39 | assert_equal "status_id", fo[1][1] |
|
39 | ||
40 | assert_equal "project_id", fo[2][1] |
|
40 | expected_order = [ | |
41 | assert_equal "tracker_id", fo[3][1] |
|
41 | "Status", | |
42 | assert_equal "priority_id", fo[4][1] |
|
42 | "Project", | |
43 | assert_equal "is_private", fo[17][1] |
|
43 | "Tracker", | |
44 | assert_equal "watcher_id", fo[18][1] |
|
44 | "Priority" | |
|
45 | ] | |||
|
46 | assert_equal expected_order, (fo.map(&:first) & expected_order) | |||
45 | end |
|
47 | end | |
46 |
|
48 | |||
47 | def test_filters_options_should_be_ordered_with_custom_fields |
|
49 | def test_filters_options_should_be_ordered_with_custom_fields | |
@@ -50,15 +52,18 class QueriesHelperTest < ActionView::TestCase | |||||
50 | :name => 'order test', :field_format => 'string', |
|
52 | :name => 'order test', :field_format => 'string', | |
51 | :is_for_all => true, :is_filter => true |
|
53 | :is_for_all => true, :is_filter => true | |
52 | ) |
|
54 | ) | |
53 | User.current = User.find_by_login('admin') |
|
55 | query = IssueQuery.new | |
54 | query = IssueQuery.new(:project => nil, :name => '_') |
|
56 | filter_count = query.available_filters.size | |
55 | assert_equal 32, query.available_filters.size |
|
|||
56 | fo = filters_options(query) |
|
57 | fo = filters_options(query) | |
57 |
assert_equal |
|
58 | assert_equal filter_count + 1, fo.size | |
58 | assert_equal "Searchable field", fo[19][0] |
|
59 | ||
59 | assert_equal "Database", fo[20][0] |
|
60 | expected_order = [ | |
60 | assert_equal "Project's Development status", fo[21][0] |
|
61 | "Searchable field", | |
61 | assert_equal "Author's order test", fo[22][0] |
|
62 | "Database", | |
62 | assert_equal "Assignee's order test", fo[23][0] |
|
63 | "Project's Development status", | |
|
64 | "Author's order test", | |||
|
65 | "Assignee's order test" | |||
|
66 | ] | |||
|
67 | assert_equal expected_order, (fo.map(&:first) & expected_order) | |||
63 | end |
|
68 | end | |
64 | end |
|
69 | end |
General Comments 0
You need to be logged in to leave comments.
Login now