kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test: switch to Rails3 Active Record syntax at unit/query_test.rb 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9622 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-05-04 23:06:47 +00:00
parent 6c6467879a
commit 49fc255b48
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/unit/query_test.rb
View File

@ -48,9 +48,9 @@ class QueryTest < ActiveSupport::TestCase
end
def find_issues_with_query(query)
Issue.find :all,
:include => [ :assigned_to, :status, :tracker, :project, :priority ],
:conditions => query.statement
Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
query.statement
).all
end
def assert_find_issues_with_query_is_successful(query)
@ -619,10 +619,9 @@ class QueryTest < ActiveSupport::TestCase
c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
assert c
assert c.sortable
issues = Issue.find :all,
:include => [ :assigned_to, :status, :tracker, :project, :priority ],
:conditions => q.statement,
:order => "#{c.sortable} ASC"
issues = Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
q.statement
).order("#{c.sortable} ASC").all
values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
assert !values.empty?
assert_equal values.sort, values
@ -633,10 +632,9 @@ class QueryTest < ActiveSupport::TestCase
c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
assert c
assert c.sortable
issues = Issue.find :all,
:include => [ :assigned_to, :status, :tracker, :project, :priority ],
:conditions => q.statement,
:order => "#{c.sortable} DESC"
issues = Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
q.statement
).order("#{c.sortable} DESC").all
values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
assert !values.empty?
assert_equal values.sort.reverse, values
@ -647,10 +645,9 @@ class QueryTest < ActiveSupport::TestCase
c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'float' }
assert c
assert c.sortable
issues = Issue.find :all,
:include => [ :assigned_to, :status, :tracker, :project, :priority ],
:conditions => q.statement,
:order => "#{c.sortable} ASC"
issues = Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
q.statement
).order("#{c.sortable} ASC").all
values = issues.collect {|i| begin; Kernel.Float(i.custom_value_for(c.custom_field).to_s); rescue; nil; end}.compact
assert !values.empty?
assert_equal values.sort, values