##// END OF EJS Templates
jro_apps » redmine
RSS
Fixing tests (sort refactoring)....
Jean-Philippe Lang -
r2509:adbe164246dd
parent child
Show More
Side by Side Unified
Context file:
r2509:adbe164246dd Loading diff...:
Show file before | Show file after | Hide comments
@@ -197,13 +197,17 class IssuesControllerTest < Test::Unit::TestCase
197 end
197 end
198
198
199 def test_index_sort
199 def test_index_sort
200 get :index, :sort_key => 'tracker'
200 get :index, :sort => 'tracker,id:desc'
201 assert_response :success
201 assert_response :success
202
202
203 sort_params = @request.session['issuesindex_sort']
203 sort_params = @request.session['issues_index_sort']
204 assert sort_params.is_a?(Hash)
204 assert sort_params.is_a?(String)
205 assert_equal 'tracker', sort_params[:key]
205 assert_equal 'tracker,id:desc', sort_params
206 assert_equal 'ASC', sort_params[:order]
206
207 issues = assigns(:issues)
208 assert_not_nil issues
209 assert !issues.empty?
210 assert_equal issues.sort {|a,b| a.tracker == b.tracker ? b.id <=> a.id : a.tracker <=> b.tracker }.collect(&:id), issues.collect(&:id)
207 end
211 end
208
212
209 def test_gantt
213 def test_gantt
Show file before | Show file after | Hide comments
@@ -20,6 +20,11 require File.dirname(__FILE__) + '/../../test_helper'
20 class SortHelperTest < HelperTestCase
20 class SortHelperTest < HelperTestCase
21 include SortHelper
21 include SortHelper
22
22
23 def setup
24 @session = nil
25 @sort_param = nil
26 end
27
23 def test_default_sort_clause_with_array
28 def test_default_sort_clause_with_array
24 sort_init 'attr1', 'desc'
29 sort_init 'attr1', 'desc'
25 sort_update(['attr1', 'attr2'])
30 sort_update(['attr1', 'attr2'])
@@ -34,6 +39,13 class SortHelperTest < HelperTestCase
34 assert_equal 'table1.attr1 DESC', sort_clause
39 assert_equal 'table1.attr1 DESC', sort_clause
35 end
40 end
36
41
42 def test_default_sort_clause_with_multiple_columns
43 sort_init 'attr1', 'desc'
44 sort_update({'attr1' => ['table1.attr1', 'table1.attr2'], 'attr2' => 'table2.attr2'})
45
46 assert_equal 'table1.attr1 DESC, table1.attr2 DESC', sort_clause
47 end
48
37 def test_params_sort
49 def test_params_sort
38 @sort_param = 'attr1,attr2:desc'
50 @sort_param = 'attr1,attr2:desc'
39
51
@@ -45,13 +57,13 class SortHelperTest < HelperTestCase
45 end
57 end
46
58
47 def test_invalid_params_sort
59 def test_invalid_params_sort
48 @sort_param = 'attr3'
60 @sort_param = 'invalid_key'
49
61
50 sort_init 'attr1', 'desc'
62 sort_init 'attr1', 'desc'
51 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
63 sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
52
64
53 assert_nil sort_clause
65 assert_equal 'table1.attr1 DESC', sort_clause
54 assert_equal '', @session['foo_bar_sort']
66 assert_equal 'attr1:desc', @session['foo_bar_sort']
55 end
67 end
56
68
57 def test_invalid_order_params_sort
69 def test_invalid_order_params_sort
General Comments 0
You need to be logged in to leave comments. Login now