hide unpublished changes notice from students

fixes CNVS-10173

test plan:
story 1 - try with both draft state enabled/disabled:
  - as a teacher
    - create a new quiz
    - save and publish the quiz
    - edit the quiz, and change and update a question, but don't save the quiz

  - as a student
    - visit the quiz that the teacher created
    - you should not see a 'You have made unpublished changes to this quiz' warning

story 2:
  - as a teacher
    - create a new quiz
    - save the quiz, don't publish it

  - as a student
    - visit the quiz that the teacher created
    - with draft state enabled
      - you should get an "Unauthorized" page
    - without draft state enabled
      - you should see the quiz page with the notice 'This quiz is unpublished'

Change-Id: I0a4933a92ff14e9d1d205219f11846e87a281ee1
Reviewed-on: https://gerrit.instructure.com/27923
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jason Madsen <jmadsen@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
Product-Review: Derek DeVries <ddevries@instructure.com>

Author: Derek DeVries

app/helpers/quizzes_helper.rb

@@ -17,18 +17,24 @@
 #
 
 module QuizzesHelper
-  def needs_unpublished_warning?(quiz=@quiz)
+  def needs_unpublished_warning?(quiz=@quiz, user=@current_user)
     if quiz.feature_enabled?(:draft_state)
-      return false unless quiz.grants_right?(@current_user, session, :read)
+      return false unless can_publish(quiz)
+      show_unpublished_changes = true
     else
-      return false unless quiz.grants_right?(@current_user, session, :manage)
+      return false unless can_read(quiz)
+      show_unpublished_changes = can_publish(quiz)
     end
 
-    !quiz.available? || quiz.unpublished_changes?
+    !quiz.available? || (show_unpublished_changes && quiz.unpublished_changes?)
   end
 
-  def can_publish(quiz)
-    can_do(quiz, @current_user, :update) || can_do(quiz, @current_user, :manage)
+  def can_read(quiz, user=@current_user)
+    can_do(quiz, user, :read)
+  end
+
+  def can_publish(quiz, user=@current_user)
+    can_do(quiz, user, :update) || can_do(quiz, user, :manage)
   end
 
   def unpublished_quiz_warning

spec/helpers/quizzes_helper_spec.rb

@@ -23,6 +23,93 @@
   include ApplicationHelper
   include QuizzesHelper
 
+  describe "#needs_unpublished_warning" do
+    before do
+      course_with_teacher
+    end
+
+    context "with draft state enabled" do
+      before do
+        @course.account.enable_feature!(:draft_state)
+      end
+
+      it "is false if quiz not manageable" do
+        quiz = Quiz.new(:context => @course)
+
+        def can_publish(quiz); false; end
+        needs_unpublished_warning?(quiz, User.new).should be_false
+      end
+
+      it "is false if quiz is available with no unpublished changes" do
+        quiz = Quiz.new(:context => @course)
+        quiz.workflow_state = 'available'
+        quiz.last_edited_at = 10.minutes.ago
+        quiz.published_at   = Time.now
+
+        def can_publish(quiz); true; end
+        needs_unpublished_warning?(quiz, User.new).should be_false
+      end
+
+      it "is true if quiz is not available" do
+        quiz = Quiz.new(:context => @course)
+        quiz.workflow_state = 'created'
+
+        def can_publish(quiz); true; end
+        needs_unpublished_warning?(quiz, User.new).should be_true
+      end
+
+      it "is true if quiz has unpublished changes" do
+        quiz = Quiz.new(:context => @course)
+        quiz.workflow_state = 'available'
+        quiz.last_edited_at = Time.now
+        quiz.published_at   = 10.minutes.ago
+
+        def can_publish(quiz); true; end
+        needs_unpublished_warning?(quiz, User.new).should be_true
+      end
+    end
+
+    context "with draft state disabled" do
+
+      it "is false if quiz is not readable" do
+        quiz = Quiz.new(:context => @course)
+
+        def can_read(quiz); false; end
+        needs_unpublished_warning?(quiz, User.new).should be_false
+      end
+
+      it "is false if quiz is available with no unpublished changes" do
+        quiz = Quiz.new(:context => @course)
+        quiz.workflow_state = 'available'
+        quiz.last_edited_at = 10.minutes.ago
+        quiz.published_at   = Time.now
+
+        def can_publish(quiz); true; end
+        needs_unpublished_warning?(quiz, User.new).should be_false
+      end
+
+      it "is true if quiz is not available" do
+        quiz = Quiz.new(:context => @course)
+        quiz.workflow_state = 'created'
+
+        def can_read(quiz); true; end
+        def can_publish(quiz); false; end
+        needs_unpublished_warning?(quiz, User.new).should be_true
+      end
+
+      it "is true if quiz has unpublished changes" do
+        quiz = Quiz.new(:context => @course)
+        quiz.workflow_state = 'available'
+        quiz.last_edited_at = Time.now
+        quiz.published_at   = 10.minutes.ago
+
+        def can_read(quiz); true; end
+        def can_publish(quiz); true; end
+        needs_unpublished_warning?(quiz, User.new).should be_true
+      end
+    end
+  end
+
   describe "#attachment_id_for" do
 
     it "returns the attachment id if attachment exists" do
@@ -130,7 +217,7 @@
   context 'fill_in_multiple_blanks_question' do
     before(:each) do
       @question_text = %q|<input name="question_1" 'value={{question_1}}' />|
-      @answer_list = [] 
+      @answer_list = []
       @answers = []
 
       def user_content(stuff); stuff; end # mock #user_content
@@ -146,13 +233,13 @@ def user_content(stuff); stuff; end # mock #user_content
 
       html.should == %q|<input name="question_1" 'value=&#39;&gt;&lt;script&gt;alert(&#39;ha!&#39;)&lt;/script&gt;&lt;img' readonly="readonly" aria-label='Fill in the blank, read surrounding text' />|
     end
-    
+
     it 'should add an appropriate label' do
       html = fill_in_multiple_blanks_question(
         :question => {:question_text => @question_text},
         :answer_list => @answer_list,
         :answers => @answers
-      ) 
+      )
 
       html.should =~ /aria\-label/
       html.should =~ /Fill in the blank/

spec/views/quizzes/show.html.erb_spec.rb

@@ -51,15 +51,25 @@
     true
   end
 
-  it "doesn't warn students if quiz is unpublished" do
+  it "doesn't warn students if quiz is published" do
     course_with_student_logged_in(:active_all => true)
-    quiz = @course.quizzes.create!
+    quiz = @course.quizzes.build
+    quiz.publish!
     assigns[:quiz] = quiz
     view_context
     render "quizzes/show"
     response.should_not have_tag ".unpublished_warning"
   end
 
+  it "warns students if quiz is unpublished" do
+    course_with_student_logged_in(:active_all => true)
+    quiz = @course.quizzes.create!
+    assigns[:quiz] = quiz
+    view_context
+    render "quizzes/show"
+    response.should have_tag ".unpublished_warning"
+  end
+
   it "should show header bar and publish button if draft state enabled" do
     Account.default.enable_feature!(:draft_state)