Index: test/integration/issues_test.rb IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- test/integration/issues_test.rb (revision 3da129ddcf3c23309afb06f57ea5b7b488859262) +++ test/integration/issues_test.rb (revision 64e2b9e851736cf26a6118b3c41d056b17bdc3da) @@ -193,19 +193,19 @@ def test_sort_links_on_index get '/projects/ecookbook/issues' - assert_select 'a[href=?]', '/projects/ecookbook/issues?sort=subject%2Cid%3Adesc', :text => 'Subject' + assert_select 'a[href=?]', '/projects/ecookbook/issues?sort=subject%3Aasc%2Cid%3Adesc', :text => 'Subject' end def test_sort_links_should_preserve_query_parameters get '/projects/ecookbook/issues?foo=bar' - assert_select 'a[href=?]', '/projects/ecookbook/issues?foo=bar&sort=subject%2Cid%3Adesc', :text => 'Subject' + assert_select 'a[href=?]', '/projects/ecookbook/issues?foo=bar&sort=subject%3Aasc%2Cid%3Adesc', :text => 'Subject' end def test_sort_links_should_not_use_params_as_url_options get '/projects/ecookbook/issues?host=foo' - assert_select 'a[href=?]', '/projects/ecookbook/issues?host=foo&sort=subject%2Cid%3Adesc', :text => 'Subject' + assert_select 'a[href=?]', '/projects/ecookbook/issues?host=foo&sort=subject%3Aasc%2Cid%3Adesc', :text => 'Subject' end def test_issue_with_user_custom_field Index: test/unit/helpers/sort_helper_test.rb IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- test/unit/helpers/sort_helper_test.rb (revision 3da129ddcf3c23309afb06f57ea5b7b488859262) +++ test/unit/helpers/sort_helper_test.rb (revision 64e2b9e851736cf26a6118b3c41d056b17bdc3da) @@ -55,7 +55,7 @@ sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'}) assert_equal ['table1.attr1 ASC', 'table2.attr2 DESC'], sort_clause - assert_equal 'attr1,attr2:desc', @session['foo_bar_sort'] + assert_equal 'attr1:asc,attr2:desc', @session['foo_bar_sort'] end def test_invalid_params_sort @@ -75,7 +75,7 @@ sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'}) assert_equal ['table1.attr1 ASC', 'table2.attr2 ASC'], sort_clause - assert_equal 'attr1,attr2', @session['foo_bar_sort'] + assert_equal 'attr1:asc,attr2:asc', @session['foo_bar_sort'] end def test_sort_css_without_params_should_use_default_sort Index: test/functional/issues_controller_test.rb IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- test/functional/issues_controller_test.rb (revision 3da129ddcf3c23309afb06f57ea5b7b488859262) +++ test/functional/issues_controller_test.rb (revision 64e2b9e851736cf26a6118b3c41d056b17bdc3da) @@ -443,7 +443,7 @@ assert_select 'input[name=?][value=?]', 'c[]', 'status' assert_select 'input[name=?][value=?]', 'c[]', 'priority' - assert_select 'input[name=?][value=?]', 'sort', 'status' + assert_select 'input[name=?][value=?]', 'sort', 'status:asc' end get :index, :project_id => 1, :set_filter => "1", :f => [] @@ -684,7 +684,7 @@ sort_params = @request.session['issues_index_sort'] assert sort_params.is_a?(String) - assert_equal 'tracker,id:desc', sort_params + assert_equal 'tracker:asc,id:desc', sort_params assert_equal issues_in_list.sort_by {|issue| [issue.tracker.position, -issue.id]}, issues_in_list assert_select 'table.issues.sort-by-tracker.sort-asc' @@ -4659,6 +4659,18 @@ assert_response :success end + def test_issues_sort_by_asc_nulls_last_not_nulls_should_be_at_top + get :index, :project_id => 1, :c => ['subject', 'due_date'], :set_filter => 1, :sort => "due_date:asc nulls last" + assert_response :success + assert_equal 3, issues_in_list.first.id + end + + def test_issues_sort_by_desc_nulls_first_not_nulls_should_be_at_bottom + get :index, :project_id => 1, :c => ['subject', 'due_date'], :set_filter => 1, :sort => "due_date:desc nulls first" + assert_response :success + assert_equal 3, issues_in_list.last.id + end + def test_destroy_issue_with_no_time_entries_should_delete_the_issues assert_nil TimeEntry.find_by_issue_id(2) @request.session[:user_id] = 2