From e4af2104b5ba83b2baa5565108b57999b198c4c4 Mon Sep 17 00:00:00 2001 From: DanielVartanov Date: Thu, 20 May 2010 19:43:48 +0600 Subject: [PATCH] Empty conditions should be [], but not {} --- test/unit/conditions_builder_spec.rb | 10 +++++----- test/unit/predicate_spec.rb | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/unit/conditions_builder_spec.rb b/test/unit/conditions_builder_spec.rb index a775400..d050555 100644 --- a/test/unit/conditions_builder_spec.rb +++ b/test/unit/conditions_builder_spec.rb @@ -40,11 +40,11 @@ end it "should return empty hash is arguments are invalid" do - ConditionsBuilder.build_conditions(nil, :gt, 1).should == {} - ConditionsBuilder.build_conditions('field', :invalid_relation, 1).should == {} - ConditionsBuilder.build_conditions('field', :gt).should == {} - ConditionsBuilder.build_conditions('field', :gt, 'value', 'redundant_value').should == {} - ConditionsBuilder.build_conditions('field', :between, 'insufficient value').should == {} + ConditionsBuilder.build_conditions(nil, :gt, 1).should == [] + ConditionsBuilder.build_conditions('field', :invalid_relation, 1).should == [] + ConditionsBuilder.build_conditions('field', :gt).should == [] + ConditionsBuilder.build_conditions('field', :gt, 'value', 'redundant_value').should == [] + ConditionsBuilder.build_conditions('field', :between, 'insufficient value').should == [] end def quoted(column_name) diff --git a/test/unit/predicate_spec.rb b/test/unit/predicate_spec.rb index 2f4a6c2..7c30250 100644 --- a/test/unit/predicate_spec.rb +++ b/test/unit/predicate_spec.rb @@ -30,15 +30,17 @@ end describe "predicate string is invalid" do + it "should not accept unrecognized format" do @predicate = Predicate.parse('blah-blah-blah') ConditionsBuilder.should_not_receive :build_conditions - @predicate.to_conditions.should == {} + @predicate.to_conditions.should == [] end + it "should not accept non-quote-marked empty string" do @predicate = Predicate.parse('born_at gt ') ConditionsBuilder.should_not_receive :build_conditions - @predicate.to_conditions.should == {} + @predicate.to_conditions.should == [] end end end \ No newline at end of file