remove trailing white-spaces from test/unit/helpers/sort_helper_test.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6768 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
78bdc37b44
commit
80d0bf0ca6
@ -1,16 +1,16 @@
|
|||||||
# Redmine - project management software
|
# Redmine - project management software
|
||||||
# Copyright (C) 2006-2009 Jean-Philippe Lang
|
# Copyright (C) 2006-2011 Jean-Philippe Lang
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or
|
# This program is free software; you can redistribute it and/or
|
||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
@ -19,65 +19,65 @@ require File.expand_path('../../../test_helper', __FILE__)
|
|||||||
|
|
||||||
class SortHelperTest < ActionView::TestCase
|
class SortHelperTest < ActionView::TestCase
|
||||||
include SortHelper
|
include SortHelper
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
@session = nil
|
@session = nil
|
||||||
@sort_param = nil
|
@sort_param = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_default_sort_clause_with_array
|
def test_default_sort_clause_with_array
|
||||||
sort_init 'attr1', 'desc'
|
sort_init 'attr1', 'desc'
|
||||||
sort_update(['attr1', 'attr2'])
|
sort_update(['attr1', 'attr2'])
|
||||||
|
|
||||||
assert_equal 'attr1 DESC', sort_clause
|
assert_equal 'attr1 DESC', sort_clause
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_default_sort_clause_with_hash
|
def test_default_sort_clause_with_hash
|
||||||
sort_init 'attr1', 'desc'
|
sort_init 'attr1', 'desc'
|
||||||
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
||||||
|
|
||||||
assert_equal 'table1.attr1 DESC', sort_clause
|
assert_equal 'table1.attr1 DESC', sort_clause
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_default_sort_clause_with_multiple_columns
|
def test_default_sort_clause_with_multiple_columns
|
||||||
sort_init 'attr1', 'desc'
|
sort_init 'attr1', 'desc'
|
||||||
sort_update({'attr1' => ['table1.attr1', 'table1.attr2'], 'attr2' => 'table2.attr2'})
|
sort_update({'attr1' => ['table1.attr1', 'table1.attr2'], 'attr2' => 'table2.attr2'})
|
||||||
|
|
||||||
assert_equal 'table1.attr1 DESC, table1.attr2 DESC', sort_clause
|
assert_equal 'table1.attr1 DESC, table1.attr2 DESC', sort_clause
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_params_sort
|
def test_params_sort
|
||||||
@sort_param = 'attr1,attr2:desc'
|
@sort_param = 'attr1,attr2:desc'
|
||||||
|
|
||||||
sort_init 'attr1', 'desc'
|
sort_init 'attr1', 'desc'
|
||||||
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
||||||
|
|
||||||
assert_equal 'table1.attr1, table2.attr2 DESC', sort_clause
|
assert_equal 'table1.attr1, table2.attr2 DESC', sort_clause
|
||||||
assert_equal 'attr1,attr2:desc', @session['foo_bar_sort']
|
assert_equal 'attr1,attr2:desc', @session['foo_bar_sort']
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_invalid_params_sort
|
def test_invalid_params_sort
|
||||||
@sort_param = 'invalid_key'
|
@sort_param = 'invalid_key'
|
||||||
|
|
||||||
sort_init 'attr1', 'desc'
|
sort_init 'attr1', 'desc'
|
||||||
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
||||||
|
|
||||||
assert_equal 'table1.attr1 DESC', sort_clause
|
assert_equal 'table1.attr1 DESC', sort_clause
|
||||||
assert_equal 'attr1:desc', @session['foo_bar_sort']
|
assert_equal 'attr1:desc', @session['foo_bar_sort']
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_invalid_order_params_sort
|
def test_invalid_order_params_sort
|
||||||
@sort_param = 'attr1:foo:bar,attr2'
|
@sort_param = 'attr1:foo:bar,attr2'
|
||||||
|
|
||||||
sort_init 'attr1', 'desc'
|
sort_init 'attr1', 'desc'
|
||||||
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
sort_update({'attr1' => 'table1.attr1', 'attr2' => 'table2.attr2'})
|
||||||
|
|
||||||
assert_equal 'table1.attr1, table2.attr2', sort_clause
|
assert_equal 'table1.attr1, table2.attr2', sort_clause
|
||||||
assert_equal 'attr1,attr2', @session['foo_bar_sort']
|
assert_equal 'attr1,attr2', @session['foo_bar_sort']
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def controller_name; 'foo'; end
|
def controller_name; 'foo'; end
|
||||||
def action_name; 'bar'; end
|
def action_name; 'bar'; end
|
||||||
def params; {:sort => @sort_param}; end
|
def params; {:sort => @sort_param}; end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user