test: skip pdf gen to improve test speeds (#596)

Author: b0ink

test/api/tasks_api_test.rb

@@ -564,96 +564,93 @@ def test_download_task_pdf
   end
 
   def test_cant_submit_until_prerequisites_submitted
-    Sidekiq::Testing.inline! do
-      # Create a unit and two task definitions
-      unit = FactoryBot.create(:unit, student_count: 1, task_count: 2)
-      td1 = unit.task_definitions.first
-      td2 = unit.task_definitions.second
-      project = unit.active_projects.first
-
-      task = project.task_for_task_definition(td2)
-
-      td1.update(
-        upload_requirements: [{ "key" => 'file0', "name" => 'Shape Class', "type" => 'code' }],
-        target_grade: 0, # Pass
-        start_date: Time.zone.now - 2.weeks,
-        target_date: Time.zone.now + 1.week
-      )
+    # Create a unit and two task definitions
+    unit = FactoryBot.create(:unit, student_count: 1, task_count: 2)
+    td1 = unit.task_definitions.first
+    td2 = unit.task_definitions.second
+    project = unit.active_projects.first
 
-      td2.update(
-        upload_requirements: [{ "key" => 'file0', "name" => 'Shape Class', "type" => 'code' }],
-        target_grade: 3, # HD
-        start_date: Time.zone.now - 2.weeks,
-        target_date: Time.zone.now + 1.week
-      )
+    task = project.task_for_task_definition(td2)
 
-      # Create a prerequisite on the second taskDef that adds the first taskDef as a prereq
-      prereq = TaskPrerequisite.create!(
-        task_definition: td2, # Before you can submit td2...
-        prerequisite: td1, # You need to submit td1
-        task_status_id: TaskStatus.ready_for_feedback.id
-      )
+    td1.update(
+      upload_requirements: [{ "key" => 'file0', "name" => 'Shape Class', "type" => 'code' }],
+      target_grade: 0, # Pass
+      start_date: Time.zone.now - 2.weeks,
+      target_date: Time.zone.now + 1.week
+    )
 
-      assert prereq.valid?
+    td2.update(
+      upload_requirements: [{ "key" => 'file0', "name" => 'Shape Class', "type" => 'code' }],
+      target_grade: 3, # HD
+      start_date: Time.zone.now - 2.weeks,
+      target_date: Time.zone.now + 1.week
+    )
 
-      # Add username and auth_token to Header
-      add_auth_header_for(user: project.user)
+    # Create a prerequisite on the second taskDef that adds the first taskDef as a prereq
+    prereq = TaskPrerequisite.create!(
+      task_definition: td2, # Before you can submit td2...
+      prerequisite: td1, # You need to submit td1
+      task_status_id: TaskStatus.ready_for_feedback.id
+    )
 
-      data_to_post = {
-        trigger: 'ready_for_feedback'
-      }
+    assert prereq.valid?
 
-      data_to_post = with_file('test_files/submissions/program.cs', 'application/json', data_to_post)
+    # Add username and auth_token to Header
+    add_auth_header_for(user: project.user)
 
-      # Attempt to make a submission that has an unsubmitted prerequisite
-      post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
-      assert_equal 409, last_response.status, last_response_body
-      task = project.task_for_task_definition(td2)
-      # Ensure the submission was denied
-      assert_equal TaskStatus.not_started, task.task_status
-      assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been submitted"
+    data_to_post = {
+      trigger: 'ready_for_feedback'
+    }
 
-      prereq.update(task_status_id: TaskStatus.discuss.id)
-      post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
-      assert_equal 409, last_response.status, last_response_body
-      task.reload
-      # Ensure the submission was denied
-      assert_equal TaskStatus.not_started, task.task_status
-      assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been discussed"
+    data_to_post = with_file('test_files/submissions/program.cs', 'application/json', data_to_post)
 
-      prereq.update(task_status_id: TaskStatus.demonstrate.id)
-      post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
-      assert_equal 409, last_response.status, last_response_body
-      task.reload
-      # Ensure the submission was denied
-      assert_equal TaskStatus.not_started, task.task_status
-      assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been demonstrated"
+    # Attempt to make a submission that has an unsubmitted prerequisite
+    post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
+    assert_equal 409, last_response.status, last_response_body
+    task = project.task_for_task_definition(td2)
+    # Ensure the submission was denied
+    assert_equal TaskStatus.not_started, task.task_status
+    assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been submitted"
 
-      prereq.update(task_status_id: TaskStatus.complete.id)
-      post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
-      assert_equal 409, last_response.status, last_response_body
-      task.reload
-      # Ensure the submission was denied
-      assert_equal TaskStatus.not_started, task.task_status
-      assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been completed"
+    prereq.update(task_status_id: TaskStatus.discuss.id)
+    post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
+    assert_equal 409, last_response.status, last_response_body
+    task.reload
+    # Ensure the submission was denied
+    assert_equal TaskStatus.not_started, task.task_status
+    assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been discussed"
 
-      prereq.update(task_status_id: TaskStatus.ready_for_feedback.id)
+    prereq.update(task_status_id: TaskStatus.demonstrate.id)
+    post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
+    assert_equal 409, last_response.status, last_response_body
+    task.reload
+    # Ensure the submission was denied
+    assert_equal TaskStatus.not_started, task.task_status
+    assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been demonstrated"
 
-      # Make a submission to the prerequsite task
-      post "/api/projects/#{project.id}/task_def_id/#{td1.id}/submission", data_to_post
-      assert_equal 201, last_response.status, last_response_body
-      task1 = project.task_for_task_definition(td1)
-      assert_equal TaskStatus.ready_for_feedback, task1.task_status
+    prereq.update(task_status_id: TaskStatus.complete.id)
+    post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
+    assert_equal 409, last_response.status, last_response_body
+    task.reload
+    # Ensure the submission was denied
+    assert_equal TaskStatus.not_started, task.task_status
+    assert_equal last_response_body['error'], "Cannot submit this task until prerequisite '#{td1.abbreviation}' has been completed"
 
-      # Re-attempt to make a submission (Prerequisite status is ready for feedback, expecting complete)
-      post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
-      assert_equal 201, last_response.status, last_response_body
-      task.reload
-      assert_equal TaskStatus.ready_for_feedback, task.task_status
+    prereq.update(task_status_id: TaskStatus.ready_for_feedback.id)
 
-      prereq.destroy
-      unit.destroy
-    end
+    # Use a direct status change here to avoid waiting for submission processing.
+    task1 = project.task_for_task_definition(td1)
+    task1.submit(project.user)
+    assert_equal TaskStatus.ready_for_feedback, task1.task_status
+
+    # Re-attempt to make a submission (Prerequisite status is ready for feedback, expecting complete)
+    post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
+    assert_equal 201, last_response.status, last_response_body
+    task.reload
+    assert_equal TaskStatus.ready_for_feedback, task.task_status
+
+    prereq.destroy
+    unit.destroy
   end
 
   def test_prerequisites_task_status
@@ -678,13 +675,6 @@ def test_prerequisites_task_status
 
     project = unit.active_projects.first
 
-    # Add username and auth_token to Header
-    add_auth_header_for(user: project.user)
-
-    data_to_post = {
-      trigger: 'ready_for_feedback'
-    }
-
     # Create a prerequisite on the second taskDef that adds the first taskDef as a prereq
     prereq = TaskPrerequisite.create!(
       task_definition: td2, # Before you can submit td2...
@@ -697,78 +687,53 @@ def test_prerequisites_task_status
     tests = [
       {
         prerequisite_status: TaskStatus.ready_for_feedback,
-        required_status: TaskStatus.ready_for_feedback,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.ready_for_feedback
       },
       {
         prerequisite_status: TaskStatus.discuss,
-        required_status: TaskStatus.discuss,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.discuss
       },
       {
         prerequisite_status: TaskStatus.demonstrate,
-        required_status: TaskStatus.demonstrate,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.demonstrate
       },
       {
         prerequisite_status: TaskStatus.discuss,
-        required_status: TaskStatus.demonstrate,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.demonstrate
       },
       {
         prerequisite_status: TaskStatus.demonstrate,
-        required_status: TaskStatus.discuss,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.discuss
       },
       {
         prerequisite_status: TaskStatus.complete,
-        required_status: TaskStatus.complete,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.complete
       },
       {
         prerequisite_status: TaskStatus.complete,
-        required_status: TaskStatus.ready_for_feedback,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.ready_for_feedback
       },
       {
         prerequisite_status: TaskStatus.discuss,
-        required_status: TaskStatus.ready_for_feedback,
-        expected_status: 201,
-        expected_error: nil
+        required_status: TaskStatus.ready_for_feedback
       }
     ]
 
-    Sidekiq::Testing.inline! do
-      prereq_task = project.task_for_task_definition(td1)
-      task = project.task_for_task_definition(td2)
-      data_to_post = with_file('test_files/submissions/program.cs', 'application/json', data_to_post)
-
-      tests.each do |test|
-        prereq_task.update(task_status_id: test[:prerequisite_status].id)
-        task.update(task_status_id: TaskStatus.not_started.id)
-
-        post "/api/projects/#{project.id}/task_def_id/#{td2.id}/submission", data_to_post
-        assert_equal test[:expected_status], last_response.status, last_response_body
-        task.reload
-        if test[:expected_status] == 201
-          # Ensure submission was accepted
-          assert_equal TaskStatus.ready_for_feedback, task.task_status
-        else
-          # Ensure submission was denied
-          assert_equal TaskStatus.not_started, task.task_status
-        end
-      end
+    prereq_task = project.task_for_task_definition(td1)
+    task = project.task_for_task_definition(td2)
+
+    tests.each do |test|
+      prereq.update!(task_status_id: test[:required_status].id)
+      prereq_task.update!(task_status_id: test[:prerequisite_status].id)
+      task.update!(task_status_id: TaskStatus.not_started.id, submission_date: nil)
 
-      prereq.destroy
-      unit.destroy
+      task.submit(project.user)
+      task.reload
+      assert_equal TaskStatus.ready_for_feedback, task.task_status
     end
+
+    prereq.destroy
+    unit.destroy
   end
 
   def test_check_in_comment
@@ -866,66 +831,60 @@ def test_requires_discussion_blocks_complete_until_discussed_comment_added
   end
 
   def test_require_comment_for_feedback_submission_assess_in_portfolio
-    Sidekiq::Testing.inline! do
-      unit = FactoryBot.create(:unit, student_count: 1, task_count: 2)
-      td1 = unit.task_definitions.first
-      project = unit.active_projects.first
-
-      task = project.task_for_task_definition(td1)
-
-      td1.update(
-        upload_requirements: [{ "key" => 'file0', "name" => 'Shape Class', "type" => 'code' }],
-        target_grade: 0, # Pass
-        start_date: Time.zone.now - 2.weeks,
-        target_date: Time.zone.now + 1.week,
-        assess_in_portfolio_only: false
-      )
+    unit = FactoryBot.create(:unit, student_count: 1, task_count: 2)
+    td1 = unit.task_definitions.first
+    project = unit.active_projects.first
 
-      add_auth_header_for(user: project.user)
+    task = project.task_for_task_definition(td1)
 
-      # Make a submission where a comment isn't required
-      post "/api/projects/#{project.id}/task_def_id/#{td1.id}/submission",
-           with_file('test_files/submissions/program.cs', 'application/json', {
-                       trigger: 'ready_for_feedback'
-                     })
-      assert_equal 201, last_response.status, last_response_body
-      task.reload
-      assert_equal TaskStatus.ready_for_feedback, task.task_status
+    td1.update(
+      upload_requirements: [{ "key" => 'file0', "name" => 'Shape Class', "type" => 'code' }],
+      target_grade: 0, # Pass
+      start_date: Time.zone.now - 2.weeks,
+      target_date: Time.zone.now + 1.week,
+      assess_in_portfolio_only: false
+    )
+
+    add_auth_header_for(user: project.user)
 
-      task.update(task_status: TaskStatus.not_started)
+    # Use a direct submit here so the test can focus on the comment requirement.
+    task.submit(project.user)
+    task.reload
+    assert_equal TaskStatus.ready_for_feedback, task.task_status
 
-      td1.update(assess_in_portfolio_only: true)
+    task.update!(task_status: TaskStatus.not_started, submission_date: nil)
 
-      # Make a submission where a comment is required
-      post "/api/projects/#{project.id}/task_def_id/#{td1.id}/submission",
-           with_file('test_files/submissions/program.cs', 'application/json', {
-                       trigger: 'ready_for_feedback'
-                     })
-      assert_equal 422, last_response.status, last_response_body
-      task.reload
-      assert_equal TaskStatus.not_started, task.task_status
+    td1.update(assess_in_portfolio_only: true)
 
-      comment = 'I would like feedback with my code..'
+    # Make a submission where a comment is required
+    post "/api/projects/#{project.id}/task_def_id/#{td1.id}/submission",
+         with_file('test_files/submissions/program.cs', 'application/json', {
+                     trigger: 'ready_for_feedback'
+                   })
+    assert_equal 422, last_response.status, last_response_body
+    task.reload
+    assert_equal TaskStatus.not_started, task.task_status
 
-      # Make a submission with comment
-      post "/api/projects/#{project.id}/task_def_id/#{td1.id}/submission",
-           with_file('test_files/submissions/program.cs', 'application/json', {
-                       trigger: 'ready_for_feedback',
-                       comment: comment
-                     })
-      assert_equal 201, last_response.status, last_response_body
-      task.reload
-      assert_equal TaskStatus.ready_for_feedback, task.task_status
+    comment = 'I would like feedback with my code..'
 
-      status_comment = task.comments.last
-      text_comment = task.comments.second_to_last
+    # Make a submission with comment
+    post "/api/projects/#{project.id}/task_def_id/#{td1.id}/submission",
+         with_file('test_files/submissions/program.cs', 'application/json', {
+                     trigger: 'ready_for_feedback',
+                     comment: comment
+                   })
+    assert_equal 201, last_response.status, last_response_body
+    task.reload
+    assert_equal TaskStatus.ready_for_feedback, task.task_status
 
-      assert_not status_comment.nil?
-      assert_not text_comment.nil?
+    status_comment = task.comments.last
+    text_comment = task.comments.second_to_last
 
-      assert_equal TaskStatus.ready_for_feedback.name, status_comment.comment
-      assert_equal comment, text_comment.comment
-    end
+    assert_not status_comment.nil?
+    assert_not text_comment.nil?
+
+    assert_equal TaskStatus.ready_for_feedback.name, status_comment.comment
+    assert_equal comment, text_comment.comment
   end
 
   def test_resubmission_doesnt_change_submission_date