fix question count for unpublished quizzes on quizzes#index page

fixes CNVS-7250

Test plan
- create an unpublished quiz with some questions
- the unpublished quiz should show the correct question count on the index page

Change-Id: Ia4d3760d3d2d0bca186591f2245da2be20f31f0a
Reviewed-on: https://gerrit.instructure.com/22834
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Stanley Stuart <stanley@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>

Author: Derek DeVries

lib/api/v1/quiz.rb

@@ -35,7 +35,6 @@ module Api::V1::Quiz
       scoring_policy
       allowed_attempts
       one_question_at_a_time
-      question_count
       points_possible
       cant_go_back
       access_code
@@ -79,6 +78,7 @@ def quiz_json(quiz, context, user, session)
     hash = api_json(quiz, user, session, API_ALLOWED_QUIZ_OUTPUT_FIELDS).merge(
       :html_url => polymorphic_url([context, quiz]),
       :mobile_url => polymorphic_url([context, quiz], :persist_headless => 1, :force_user => 1),
+      :question_count => quiz.question_count + quiz.unpublished_question_count,
       :published => quiz.published?
     )
     locked_json(hash, quiz, user, 'quiz', :context => context)

spec/apis/v1/quizzes_api_spec.rb

@@ -103,6 +103,25 @@ def api_get_json
       it "includes published" do
         @json['published'].should == false
       end
+
+      it "includes question count" do
+        @json['question_count'].should == 0
+      end
+    end
+
+    context "unpublished quiz" do
+      before do
+        @quiz = @course.quizzes.create! :title => 'title'
+        @quiz.quiz_questions.create!(:question_data => { :name => "test 1" })
+        @quiz.save!
+
+        @json = api_call(:get, "/api/v1/courses/#{@course.id}/quizzes/#{@quiz.id}",
+                        :controller=>"quizzes_api", :action=>"show", :format=>"json", :course_id=>"#{@course.id}", :id => "#{@quiz.id}")
+      end
+
+      it "includes unpublished questions in question count" do
+        @json['question_count'].should == 1
+      end
     end
 
     context "non-existent quiz" do