Fixed #show @next_question tests, got them passing

nickh · Nov 15, 2009 · 045670d · 045670d
1 parent 0c4e21c
commit 045670d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/controllers/responses_controller.rb b/app/controllers/responses_controller.rb
@@ -30,7 +30,8 @@ def create
   end
 
   def show
-    redirect_to(new_response_path) if @response.nil? || params[:id].to_i != @response.id
+    return redirect_to(new_response_path) if @response.nil? || params[:id].to_i != @response.id
+    @next_question = @response.next_question
   end
 
   def update

diff --git a/spec/controllers/responses_controller_spec.rb b/spec/controllers/responses_controller_spec.rb
@@ -127,6 +127,7 @@
     describe 'when there are unanswered questions' do
       before do
         @test_answers = (1..3).collect{|i| Answer.create(:question_id => i, :response => @test_response)}
+        session[:respondent] = @test_respondent
       end
 
       it 'should have a next question' do
@@ -138,10 +139,12 @@
     describe 'when all questions have been answered' do
       before do
         @test_answers = @test_questions.collect{|q| Answer.create(:question_id => q.id, :response => @test_response)}
+        session[:respondent] = @test_respondent
       end
 
       it 'should not have a next question' do
         get :show, :id => @test_response.id
+        assigns.should have_key(:next_question)
         assigns[:next_question].should be_nil
       end
     end