##// END OF EJS Templates
test: switch to Rails3 Active Record syntax at unit/query_test.rb...
Toshi MARUYAMA -
r9439:49fc255b48b6
parent child
Show More
@@ -48,9 +48,9 class QueryTest < ActiveSupport::TestCase
48 end
48 end
49
49
50 def find_issues_with_query(query)
50 def find_issues_with_query(query)
51 Issue.find :all,
51 Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
52 :include => [ :assigned_to, :status, :tracker, :project, :priority ],
52 query.statement
53 :conditions => query.statement
53 ).all
54 end
54 end
55
55
56 def assert_find_issues_with_query_is_successful(query)
56 def assert_find_issues_with_query_is_successful(query)
@@ -619,10 +619,9 class QueryTest < ActiveSupport::TestCase
619 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
619 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
620 assert c
620 assert c
621 assert c.sortable
621 assert c.sortable
622 issues = Issue.find :all,
622 issues = Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
623 :include => [ :assigned_to, :status, :tracker, :project, :priority ],
623 q.statement
624 :conditions => q.statement,
624 ).order("#{c.sortable} ASC").all
625 :order => "#{c.sortable} ASC"
626 values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
625 values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
627 assert !values.empty?
626 assert !values.empty?
628 assert_equal values.sort, values
627 assert_equal values.sort, values
@@ -633,10 +632,9 class QueryTest < ActiveSupport::TestCase
633 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
632 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
634 assert c
633 assert c
635 assert c.sortable
634 assert c.sortable
636 issues = Issue.find :all,
635 issues = Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
637 :include => [ :assigned_to, :status, :tracker, :project, :priority ],
636 q.statement
638 :conditions => q.statement,
637 ).order("#{c.sortable} DESC").all
639 :order => "#{c.sortable} DESC"
640 values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
638 values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
641 assert !values.empty?
639 assert !values.empty?
642 assert_equal values.sort.reverse, values
640 assert_equal values.sort.reverse, values
@@ -647,10 +645,9 class QueryTest < ActiveSupport::TestCase
647 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'float' }
645 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'float' }
648 assert c
646 assert c
649 assert c.sortable
647 assert c.sortable
650 issues = Issue.find :all,
648 issues = Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
651 :include => [ :assigned_to, :status, :tracker, :project, :priority ],
649 q.statement
652 :conditions => q.statement,
650 ).order("#{c.sortable} ASC").all
653 :order => "#{c.sortable} ASC"
654 values = issues.collect {|i| begin; Kernel.Float(i.custom_value_for(c.custom_field).to_s); rescue; nil; end}.compact
651 values = issues.collect {|i| begin; Kernel.Float(i.custom_value_for(c.custom_field).to_s); rescue; nil; end}.compact
655 assert !values.empty?
652 assert !values.empty?
656 assert_equal values.sort, values
653 assert_equal values.sort, values
General Comments 0
You need to be logged in to leave comments. Login now