Skip to content

Commit

Permalink
fixing typo in specs. fixing cucumber on hudson due to residual objec…
Browse files Browse the repository at this point in the history
…ts in db from specs
  • Loading branch information
Mark Yoon committed Feb 3, 2011
1 parent beedebb commit 16084de
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 21 deletions.
16 changes: 9 additions & 7 deletions spec/models/dependency_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,13 @@
end
end
describe Dependency, "with conditions" do
@dependency = Dependency.new(:rule => "A and B and C", :question_id => 1)
Factory(:dependency_condition, :dependency => @dependency, :rule_key => "A")
Factory(:dependency_condition, :dependency => @dependency, :rule_key => "B")
Factory(:dependency_condition, :dependency => @dependency, :rule_key => "C")
dc_ids = @dependency.dependency_conditions.map(&:id)
@dependency.destroy
dc_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
it "should destroy conditions when destroyed" do
@dependency = Dependency.new(:rule => "A and B and C", :question_id => 1)
Factory(:dependency_condition, :dependency => @dependency, :rule_key => "A")
Factory(:dependency_condition, :dependency => @dependency, :rule_key => "B")
Factory(:dependency_condition, :dependency => @dependency, :rule_key => "C")
dc_ids = @dependency.dependency_conditions.map(&:id)
@dependency.destroy
dc_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
end
end
23 changes: 9 additions & 14 deletions spec/models/validation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,15 @@ def test_var(vhash, vchashes, ahash, rhash)
it "should validate a response by regexp" do
test_var({}, [{:operator => "=~", :regexp => /^[a-z]{1,6}$/}], {:response_class => "string"}, {:string_value => ""}).should be_false
end
it "should validate a response by (in)equality" do
# test_var({:operator => "!=", :datetime_value => Date.today + 1}, {:response_class => "date"}, {:datetime_value => Date.today}).should be_true
# test_var({:operator => "==", :answer_id => 2}, {:response_class => "answer"}, {:answer_id => 2}).should be_false
end
it "should validate a response by lookup" do

end
end
describe Validation, "with conditions" do
@validation = Factory(:validation)
Factory(:validation_condition, :validation => @validation, :rule_key => "A")
Factory(:validation_condition, :validation => @validation, :rule_key => "B")
Factory(:validation_condition, :validation => @validation, :rule_key => "C")
v_ids = @validation.validation_conditions.map(&:id)
@validation.destroy
v_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
it "should destroy conditions when destroyed" do
@validation = Factory(:validation)
Factory(:validation_condition, :validation => @validation, :rule_key => "A")
Factory(:validation_condition, :validation => @validation, :rule_key => "B")
Factory(:validation_condition, :validation => @validation, :rule_key => "C")
v_ids = @validation.validation_conditions.map(&:id)
@validation.destroy
v_ids.each{|id| DependencyCondition.find_by_id(id).should == nil}
end
end

0 comments on commit 16084de

Please sign in to comment.