spec: fix fragile assessments specs, remove duplicate spec

Test Plan:
- pass Jenkins
- check for syntax errors

Change-Id: Ic16c889d6de328c9638823237b821bee78d570d8
Reviewed-on: https://gerrit.instructure.com/65649
Tested-by: Jenkins
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>

Author: mycargus

spec/selenium/discussions/discussions_edit_page_spec.rb

@@ -102,7 +102,8 @@
             # should correctly save changes to the assignment
             set_value f('#discussion_topic_assignment_points_possible'), '123'
           end
-          expect(Assignment.last.points_possible).to eq 123
+          assignment.reload
+          expect(assignment.points_possible).to eq 123
         end
 
         it "should warn user when leaving page unsaved", priority: "1", test_id: 270919 do

spec/selenium/helpers/assignment_overrides.rb

@@ -333,7 +333,8 @@ def validate_quiz_show_page(message)
   def validate_vdd_quiz_tooltip_dates(context_selector, message)
     keep_trying_until(2) do
       driver.mouse.move_to fln('Multiple Dates', f("#{context_selector}"))
-      expect(fj('.ui-tooltip')).to include_text("#{message}")
+      wait_for_ajaximations
+      expect(fj('.ui-tooltip:visible')).to include_text("#{message}")
     end
   end
 

spec/selenium/helpers/public_courses_context.rb

@@ -6,7 +6,7 @@ def ensure_logged_out
   end
 
   def validate_selector_displayed(selector)
-    expect(f(selector)).to be_displayed
+    expect(f(selector)).to be_truthy
   end
 
   let!(:public_course) do

spec/selenium/quizzes/quizzes_restrictions_student_spec.rb

@@ -4,6 +4,11 @@
 describe 'quiz restrictions as a student' do
   include_context 'in-process server selenium tests'
 
+  def begin_taking_quiz
+    get "/courses/#{@course.id}/quizzes/#{@quiz.id}"
+    expect_new_page_load { f('#take_quiz_link').click }
+  end
+
   context 'restrict access code' do
     before do
       course_with_student_logged_in
@@ -14,27 +19,20 @@
       @quiz.save!
     end
 
+    def submit_quiz_access_code(access_code)
+      begin_taking_quiz
+      f('#quiz_access_code').send_keys(access_code)
+      expect_new_page_load { f('button.btn').click }
+    end
+
     it 'should allow you to enter in a correct access token password to view the quiz' do
-      get "/courses/#{@course.id}/quizzes/#{@quiz.id}"
-      f('#take_quiz_link').click
-      wait_for_ajaximations
-
-      f('#quiz_access_code').send_keys(@password)
-      f('button.btn').click
-      wait_for_ajaximations
-      expect(f('h2')).to include_text('Quiz Instructions')
+      submit_quiz_access_code(@password)
+      expect(f('.quiz-header')).to include_text 'Quiz Instructions'
     end
 
     it 'should not allow you to enter in a incorrect access token password to view the quiz' do
-      get "/courses/#{@course.id}/quizzes/#{@quiz.id}"
-      f('#take_quiz_link').click
-      wait_for_ajaximations
-
-      f('#quiz_access_code').send_keys('lechuck')
-      f('button.btn').click
-      wait_for_ajaximations
-
-      expect(f('#quiz_access_code')).to be
+      submit_quiz_access_code('lechuck')
+      expect(f('#quiz_access_code').text).to eq ''
     end
   end
 
@@ -49,10 +47,8 @@
     end
 
     it 'should not be accessible from invalid ip address' do
-      get "/courses/#{@course.id}/quizzes/#{@quiz.id}"
-      f('#take_quiz_link').click
-      wait_for_ajaximations
-      expect(f('#content')).to include_text('This quiz is protected and is only available from certain locations')
+      begin_taking_quiz
+      expect(f('#content')).to include_text 'This quiz is protected and is only available from certain locations'
     end
   end
 end

spec/selenium/quizzes/varied_due_dates/quizzes_vdd_index_page_observer_spec.rb

@@ -16,26 +16,34 @@
 
     it 'shows the due dates for Section A', priority: "2", test_id: 282169 do
       skip('Bug ticket created: CNVS-22794')
-      validate_vdd_quiz_tooltip_dates('.date-due', \
-        "Everyone else\n#{format_date_for_view(@due_at_a)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-due',
+        "Everyone else\n#{format_date_for_view(@due_at_a)}"
+      )
     end
 
     it 'shows the due dates for Section B', priority: "2", test_id: 315666 do
       skip('Bug ticket created: CNVS-22794')
-      validate_vdd_quiz_tooltip_dates('.date-due', \
-        "#{@section_b.name}\n#{format_date_for_view(@due_at_b)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-due',
+        "#{@section_b.name}\n#{format_date_for_view(@due_at_b)}"
+      )
     end
 
     it 'shows the availability dates for Section A', priority: "2", test_id: 282397 do
       skip('Bug ticket created: CNVS-22793')
-      validate_vdd_quiz_tooltip_dates('.date-available', \
-        "Everyone else\nAvailable until #{format_date_for_view(@lock_at_a)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-available',
+        "Everyone else\nAvailable until #{format_date_for_view(@lock_at_a)}"
+      )
     end
 
     it 'shows the availability dates for Section B', priority: "2", test_id: 315669 do
       skip('Bug ticket created: CNVS-22793')
-      validate_vdd_quiz_tooltip_dates('.date-available', \
-        "#{@section_b.name}\nNot available until #{format_date_for_view(@unlock_at_b)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-available',
+        "#{@section_b.name}\nNot available until #{format_date_for_view(@unlock_at_b)}"
+      )
     end
   end
 

spec/selenium/quizzes/varied_due_dates/quizzes_vdd_index_page_ta_spec.rb

@@ -14,23 +14,31 @@
     end
 
     it 'shows the due dates for Section A', priority: "2", test_id: 282168 do
-      validate_vdd_quiz_tooltip_dates('.date-due', \
-        "Everyone else\n#{format_date_for_view(@due_at_a)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-due',
+        "Everyone else\n#{format_date_for_view(@due_at_a)}"
+      )
     end
 
     it 'shows the due dates for Section B', priority: "2", test_id: 315651 do
-      validate_vdd_quiz_tooltip_dates('.date-due', \
-        "#{@section_b.name}\n#{format_date_for_view(@due_at_b)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-due',
+        "#{@section_b.name}\n#{format_date_for_view(@due_at_b)}"
+      )
     end
 
     it 'shows the availability dates for Section A', priority: "2", test_id: 282395 do
-      validate_vdd_quiz_tooltip_dates('.date-available', \
-        "Everyone else\nAvailable until #{format_date_for_view(@lock_at_a)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-available',
+        "Everyone else\nAvailable until #{format_date_for_view(@lock_at_a)}"
+      )
     end
 
     it 'shows the availability dates for Section B', priority: "2", test_id: 315653 do
-      validate_vdd_quiz_tooltip_dates('.date-available', \
-        "#{@section_b.name}\nNot available until #{format_date_for_view(@unlock_at_b)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-available',
+        "#{@section_b.name}\nNot available until #{format_date_for_view(@unlock_at_b)}"
+      )
     end
   end
 end

spec/selenium/quizzes/varied_due_dates/quizzes_vdd_index_page_teacher_spec.rb

@@ -14,23 +14,31 @@
     end
 
     it 'shows the due dates for Section A', priority: "1", test_id: 282167 do
-      validate_vdd_quiz_tooltip_dates('.date-due', \
-        "Everyone else\n#{format_date_for_view(@due_at_a)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-due',
+        "Everyone else\n#{format_date_for_view(@due_at_a)}"
+      )
     end
 
     it 'shows the due dates for Section B', priority: "1", test_id: 315661 do
-      validate_vdd_quiz_tooltip_dates('.date-due', \
-        "#{@section_b.name}\n#{format_date_for_view(@due_at_b)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-due',
+        "#{@section_b.name}\n#{format_date_for_view(@due_at_b)}"
+      )
     end
 
     it 'shows the availability dates for Section A', priority: "1", test_id: 282393 do
-      validate_vdd_quiz_tooltip_dates('.date-available', \
-        "Everyone else\nAvailable until #{format_date_for_view(@lock_at_a)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-available',
+        "Everyone else\nAvailable until #{format_date_for_view(@lock_at_a)}"
+      )
     end
 
     it 'shows the availability dates for Section B', priority: "1", test_id: 315663 do
-      validate_vdd_quiz_tooltip_dates('.date-available', \
-        "#{@section_b.name}\nNot available until #{format_date_for_view(@unlock_at_b)}")
+      validate_vdd_quiz_tooltip_dates(
+        '.date-available',
+        "#{@section_b.name}\nNot available until #{format_date_for_view(@unlock_at_b)}"
+      )
     end
   end
 end

spec/selenium/quizzes_student_spec.rb

@@ -83,7 +83,7 @@ def prepare_quiz
 
           keep_trying_until do
             Quizzes::QuizSubmission.last
-            expect(fj('#times_up_dialog:visible')).to be_present
+            expect(fj('#times_up_dialog:visible')).to include_text 'Time\'s Up!'
           end
         end
       end

spec/selenium/quizzes_student_with_draft_state_spec.rb

@@ -27,13 +27,13 @@
       it 'shows an error', priority: "1", test_id: 209419 do
         get "/courses/#{@course.id}/quizzes/#{@q.id}"
         wait_for_ajaximations
-        expect(f('#unauthorized_holder')).to be_displayed
+        expect(f('.ui-state-error')).to include_text 'Unauthorized'
       end
 
       it 'can\'t take an unpublished quiz', priority: "1", test_id: 209420 do
         get "/courses/#{@course.id}/quizzes/#{@q.id}/take"
         wait_for_ajaximations
-        expect(f('#unauthorized_holder')).to be_displayed
+        expect(f('.ui-state-error')).to include_text 'Unauthorized'
       end
     end
 
@@ -47,7 +47,7 @@
       it 'shows an error', priority: "1", test_id: 209421 do
         get "/courses/#{@course.id}/quizzes/#{@q.id}/"
         wait_for_ajaximations
-        expect(f('.lock_explanation')).to be_displayed
+        expect(f('.lock_explanation')).to include_text 'This quiz is locked'
       end
     end
   end

spec/selenium/quizzes_teacher_with_draft_state_spec.rb

@@ -10,50 +10,34 @@
     @course.update_attributes(name: 'teacher course')
     @course.save!
     @course.reload
+    create_quiz_with_due_date
   end
 
-  it 'clicking the unpublish button unpublishes a quiz', priority: "1", test_id: 210052 do
-    @context = @course
-    q = quiz_model
-    q.publish!
-
-    get "/courses/#{@course.id}/quizzes/#{q.id}"
-    expect(f('#quiz-publish-link')).to include_text('Published')
-
-    expect_new_page_load do
-      f('.quiz-publish-button').click
-      wait_for_ajaximations
-    end
-
-    # move mouse to not be hover over the button
-    driver.mouse.move_to f('#footer')
-
-    keep_trying_until do
-      expect(f('#quiz-publish-link')).not_to include_text('Published')
-      expect(f('#quiz-publish-link')).to include_text('Publish')
+  context 'when there is a single due date' do
+    it 'doesn\'t display "Multiple Dates"' do
+      get "/courses/#{@course.id}/quizzes"
+      expect(f('.ig-details .date-due')).not_to include_text 'Multiple Dates'
+      expect(f('.ig-details .date-available')).not_to include_text 'Multiple Dates'
     end
   end
 
   context 'when there are multiple due dates' do
+    before(:each) { add_due_date_override(@quiz) }
 
     it 'shows a due date summary', priority: "2", test_id: 210053 do
-      create_quiz_with_due_date
-      get "/courses/#{@course.id}/quizzes"
-      expect(f('.ig-details .date-due')).not_to include_text 'Multiple Dates'
-      expect(f('.ig-details .date-available')).not_to include_text 'Multiple Dates'
-
-      add_due_date_override(@quiz)
-
+      # verify page
       get "/courses/#{@course.id}/quizzes"
       expect(f('.ig-details .date-due')).to include_text 'Multiple Dates'
-      driver.mouse.move_to f('.ig-details .date-due a')
+      expect(f('.ig-details .date-available')).to include_text 'Multiple Dates'
+
+      # verify tooltips
+      driver.mouse.move_to f('.ig-details .date-available a')
       wait_for_ajaximations
       tooltip = fj('.ui-tooltip:visible')
       expect(tooltip).to include_text 'New Section'
       expect(tooltip).to include_text 'Everyone else'
 
-      expect(f('.ig-details .date-available')).to include_text 'Multiple Dates'
-      driver.mouse.move_to f('.ig-details .date-available a')
+      driver.mouse.move_to f('.ig-details .date-due a')
       wait_for_ajaximations
       tooltip = fj('.ui-tooltip:visible')
       expect(tooltip).to include_text 'New Section'