From 1d937aa19e87ee6eaa80c8683bc8cf98df0d008b Mon Sep 17 00:00:00 2001 From: Marco Otte-Witte Date: Tue, 28 Apr 2009 18:25:40 +0200 Subject: [PATCH] fixed failing spec --- spec/classes/report_spec.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/spec/classes/report_spec.rb b/spec/classes/report_spec.rb index 6755f10..0332a88 100644 --- a/spec/classes/report_spec.rb +++ b/spec/classes/report_spec.rb @@ -407,7 +407,12 @@ custom_conditions = { :first_name => 'first name', :last_name => 'last name' } conditions = @report.send(:setup_conditions, @begin_at, @end_at, custom_conditions) - conditions.should == ['"users"."first_name" = \'first name\' AND "users"."last_name" = \'last name\' AND "users"."created_at" BETWEEN ? AND ?', @begin_at, @end_at] + # cannot directly check for string equqlity here since hashes are not ordered and so there is no way to now in which order the conditions are added to the SQL clause + conditions[0].should =~ (/"users"."first_name" = \'first name\'/) + conditions[0].should =~ (/"users"."last_name" = \'last name\'/) + conditions[0].should =~ (/"users"."created_at" BETWEEN \? AND \?/) + conditions[1].should == @begin_at + conditions[2].should == @end_at end it 'should correctly translate { :column => nil }' do