Skip to content

Commit

Permalink
Empty conditions should be [], but not {}
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielVartanov committed May 20, 2010
1 parent 59a9031 commit e4af210
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 5 additions & 5 deletions test/unit/conditions_builder_spec.rb
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions test/unit/predicate_spec.rb
Expand Up @@ -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

0 comments on commit e4af210

Please sign in to comment.