From bfb34f2d0ef0a40d79cad1a91cfc972e29ee089e Mon Sep 17 00:00:00 2001 From: Luke Baker Date: Wed, 27 Apr 2011 08:00:41 -0400 Subject: [PATCH] fix bug in question creation --- app/models/choice.rb | 4 +++- spec/models/choice_spec.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/choice.rb b/app/models/choice.rb index 82df0b1..a73f9b9 100644 --- a/app/models/choice.rb +++ b/app/models/choice.rb @@ -29,7 +29,9 @@ class Choice < ActiveRecord::Base def update_prompt_queue if self.changed.include?('active') && self.active? self.question.mark_prompt_queue_for_refill - self.question.choose_prompt + if self.question.choices.size - self.question.inactive_choices_count > 1 + self.question.choose_prompt + end end end diff --git a/spec/models/choice_spec.rb b/spec/models/choice_spec.rb index 3d4a6a9..ecf275f 100644 --- a/spec/models/choice_spec.rb +++ b/spec/models/choice_spec.rb @@ -88,7 +88,7 @@ describe Choice do it "should create a delayed job on activation" do choice1 = Choice.create!(@valid_attributes.merge(:data => '1234')) - proc { choice1.deactivate! }.should change(Delayed::Job, :count).by(1) + proc { choice1.activate! }.should change(Delayed::Job, :count).by(1) end it "should update a question's counter cache on deactivation" do -- libgit2 0.21.2