Fixing tests (sort refactoring).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2577 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index f9ee2d767b976545944c6a84ba681524048d8bcd..9dd188011cff1f3e22ac62e7f486b35268647f32 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -197,13 +197,17 @@ class IssuesControllerTest < Test::Unit::TestCase
   end
   
   def test_index_sort
-    get :index, :sort_key => 'tracker'
+    get :index, :sort => 'tracker,id:desc'
     assert_response :success
     
-    sort_params = @request.session['issuesindex_sort']
-    assert sort_params.is_a?(Hash)
-    assert_equal 'tracker', sort_params[:key]
-    assert_equal 'ASC', sort_params[:order]
+    sort_params = @request.session['issues_index_sort']
+    assert sort_params.is_a?(String)
+    assert_equal 'tracker,id:desc', sort_params
+    
+    issues = assigns(:issues)
+    assert_not_nil issues
+    assert !issues.empty?
+    assert_equal issues.sort {|a,b| a.tracker == b.tracker ? b.id <=> a.id : a.tracker <=> b.tracker }.collect(&:id), issues.collect(&:id)
   end
 
   def test_gantt

diff --git a/test/unit/helpers/sort_helper_test.rb b/test/unit/helpers/sort_helper_test.rb
index 9132beb2153cb3e0d8692cf95e5c93316f06fe89..d2aca110a9329fc4590f103bd4ebad8a9d66cd6e 100644 (file)
--- a/test/unit/helpers/sort_helper_test.rb
+++ b/test/unit/helpers/sort_helper_test.rb
@@ -20,6 +20,11 @@ require File.dirname(__FILE__) + '/../../test_helper'
 class SortHelperTest < HelperTestCase\r
   include SortHelper\r
   \r
+  def setup\r
+    @session = nil\r
+    @sort_param = nil\r
+  end\r
+  \r
   def test_default_sort_clause_with_array\r
     sort_init 'attr1', 'desc'\r
     sort_update(['attr1', 'attr2'])\r
@@ -34,6 +39,13 @@ class SortHelperTest < HelperTestCase
     assert_equal 'table1.attr1 DESC', sort_clause\r
   end\r
   \r
+  def test_default_sort_clause_with_multiple_columns\r
+    sort_init 'attr1', 'desc'\r
+    sort_update({'attr1' => ['table1.attr1', 'table1.attr2'], 'attr2' => 'table2.attr2'})\r
+\r
+    assert_equal 'table1.attr1 DESC, table1.attr2 DESC', sort_clause\r
+  end\r
+  \r
   def test_params_sort\r
     @sort_param = 'attr1,attr2:desc'\r
     \r
@@ -45,13 +57,13 @@ class SortHelperTest < HelperTestCase
   end\r
   \r
   def test_invalid_params_sort\r
-    @sort_param = 'attr3'\r
+    @sort_param = 'invalid_key'\r
     \r
     sort_init 'attr1', 'desc'\r
     sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})\r
 \r
-    assert_nil sort_clause\r
-    assert_equal '', @session['foo_bar_sort']\r
+    assert_equal 'table1.attr1 DESC', sort_clause\r
+    assert_equal 'attr1:desc', @session['foo_bar_sort']\r
   end\r
   \r
   def test_invalid_order_params_sort\r