Add basic feature tests for sessions

This adds some basic tests that cover the functionality of creating a
clinic or school session.

Jira-Issue: MAV-2645

Author: thomasleese

spec/factories/patients.rb

@@ -55,16 +55,16 @@
 
   factory :patient do
     transient do
-      academic_year { AcademicYear.current }
+      academic_year { session&.academic_year || AcademicYear.current }
+      location { session&.location }
+      location_name { nil }
       parents { [] }
       performed_by { association(:user) }
       programmes { session&.programmes || [] }
-      session { nil }
-      year_group { programmes.flat_map(&:default_year_groups).sort.uniq.first }
-      location_name { nil }
       random_nhs_number { false }
-
+      session { nil }
       team { session&.team || school&.team || create(:team, programmes:) }
+      year_group { programmes.flat_map(&:default_year_groups).sort.uniq.first }
     end
 
     nhs_number do
@@ -124,14 +124,9 @@
     end
 
     after(:create) do |patient, evaluator|
-      if (session = evaluator.session)
-        location_id = session.location_id
-        academic_year = session.academic_year
-        PatientLocation.find_or_create_by!(
-          patient:,
-          location_id:,
-          academic_year:
-        )
+      if (location = evaluator.location) &&
+           (academic_year = evaluator.academic_year)
+        PatientLocation.find_or_create_by!(patient:, location:, academic_year:)
       end
     end
 

…/features/manage_clinic_sessions_spec.rb spec/features/sessions_clinic_spec.rbspec/features/manage_clinic_sessions_spec.rb renamed to spec/features/sessions_clinic_spec.rb spec/features/manage_clinic_sessions_spec.rb renamed to spec/features/sessions_clinic_spec.rb

@@ -1,32 +1,28 @@
 # frozen_string_literal: true
 
-describe "Manage clinic sessions" do
+describe "Clinic sessions" do
   around { |example| travel_to(Time.zone.local(2024, 2, 18)) { example.run } }
 
-  scenario "Adding dates to the session, sending reminders and closing consent" do
+  before { Flipper.enable(:schools_and_sessions) }
+
+  scenario "adding a new session, sending reminders and closing consent" do
     given_my_team_is_running_an_hpv_vaccination_programme
     and_i_am_signed_in
 
     when_i_go_to_todays_sessions_as_a_nurse
     then_i_see_no_sessions
 
-    when_i_go_to_unscheduled_sessions
-    then_i_see_the_community_clinic
-
-    when_i_click_on_the_community_clinic
-    then_i_see_the_clinic_session
-
-    when_i_click_on_schedule_sessions
-    then_i_see_the_dates_page
-
-    when_i_choose_the_dates
+    when_i_click_on_add_a_new_session
+    and_i_choose_community_clinic
+    and_i_choose_the_programmes
+    and_i_choose_the_dates
     then_i_see_the_confirmation_page
 
     when_i_click_on_change_invitations
     then_i_see_the_change_invitations_page
     and_i_change_invitations_date
 
-    when_i_save_changes
+    when_i_save_the_session
     then_i_should_see_the_session_details
 
     when_i_go_to_todays_sessions_as_a_nurse
@@ -73,19 +69,15 @@ def given_my_team_is_running_an_hpv_vaccination_programme
         programmes: [@programme]
       )
 
-    @session =
-      create(
-        :session,
-        :unscheduled,
-        team: @team,
-        programmes: [@programme],
-        location: @team.generic_clinic
-      )
-
     @parent = create(:parent)
 
     @patient =
-      create(:patient, year_group: 8, session: @session, parents: [@parent])
+      create(
+        :patient,
+        year_group: 8,
+        location: @team.generic_clinic,
+        parents: [@parent]
+      )
   end
 
   def and_i_am_signed_in
@@ -131,16 +123,29 @@ def then_i_see_the_clinic_session
     expect(page).to have_content("No dates scheduled")
   end
 
-  def when_i_click_on_schedule_sessions
-    click_on "Edit session"
-    click_on "Add session dates"
+  def when_i_click_on_add_a_new_session
+    click_on "Add a new session"
   end
 
-  def then_i_see_the_dates_page
-    expect(page).to have_content("When will this session be held?")
+  def and_i_choose_community_clinic
+    expect(page).to have_content("What type of session is this?")
+
+    choose "Community clinic"
+    click_on "Continue"
   end
 
-  def when_i_choose_the_dates
+  def and_i_choose_the_programmes
+    expect(page).to have_content(
+      "Which programmes will you run in this session?"
+    )
+
+    check "HPV"
+    click_on "Continue"
+  end
+
+  def and_i_choose_the_dates
+    expect(page).to have_content("When will this session be held?")
+
     fill_in "Day", with: "10"
     fill_in "Month", with: "03"
     fill_in "Year", with: "2024"
@@ -173,7 +178,7 @@ def when_i_choose_the_dates
   end
 
   def then_i_see_the_confirmation_page
-    expect(page).to have_content("Edit session")
+    expect(page).to have_content("Check and confirm")
     expect(page).to have_content("InvitationsSend on Sunday, 18 February 2024")
   end
 
@@ -192,8 +197,8 @@ def and_i_change_invitations_date
     click_on "Continue"
   end
 
-  def when_i_save_changes
-    click_on "Save changes"
+  def when_i_save_the_session
+    click_on "Continue"
   end
 
   def then_i_should_see_the_session_details
@@ -210,7 +215,7 @@ def when_the_patient_has_been_invited
       :clinic_notification,
       :initial_invitation,
       patient: @patient,
-      session: @session
+      session: Session.last
     )
   end
 

…/features/manage_school_sessions_spec.rb spec/features/sessions_school_spec.rbspec/features/manage_school_sessions_spec.rb renamed to spec/features/sessions_school_spec.rb spec/features/manage_school_sessions_spec.rb renamed to spec/features/sessions_school_spec.rb

@@ -1,26 +1,21 @@
 # frozen_string_literal: true
 
-describe "Manage school sessions" do
+describe "School sessions" do
   around { |example| travel_to(Time.zone.local(2024, 2, 18)) { example.run } }
 
-  scenario "Adding a new session, closing consent, and closing the session" do
+  before { Flipper.enable(:schools_and_sessions) }
+
+  scenario "adding a new session, closing consent, and closing the session" do
     given_my_team_is_running_an_hpv_vaccination_programme
     and_i_am_signed_in
 
     when_i_go_to_todays_sessions_as_a_nurse
     then_i_see_no_sessions
 
-    when_i_go_to_unscheduled_sessions
-    then_i_see_the_school
-
-    when_i_seach_for_the_school
-    then_i_see_the_school
-
-    when_i_click_on_the_school
-    then_i_see_the_school_session
-    and_i_see_a_child_in_the_cohort
-
-    when_i_click_on_schedule_sessions
+    when_i_click_on_add_a_new_session
+    and_i_choose_the_school
+    and_i_choose_the_programmes
+    and_i_choose_the_year_groups
     then_i_see_the_dates_page
 
     when_i_add_an_invalid_date
@@ -42,14 +37,15 @@
     then_i_see_the_change_consent_reminders_page
     and_i_change_consent_reminders_weeks
 
-    when_i_save_changes
+    when_i_save_the_session
     then_i_should_see_the_session_details
 
     when_i_go_to_todays_sessions_as_a_nurse
     then_i_see_no_sessions
 
     when_i_go_to_scheduled_sessions
     then_i_see_the_school
+    and_i_see_a_child_in_the_cohort
 
     when_i_go_to_completed_sessions
     then_i_see_no_sessions
@@ -90,19 +86,11 @@ def given_my_team_is_running_an_hpv_vaccination_programme
         programmes: [@programme, @other_programme]
       )
     @location = create(:school, :secondary, team: @team)
-    @session =
-      create(
-        :session,
-        :unscheduled,
-        location: @location,
-        team: @team,
-        programmes: [@programme]
-      )
 
     @parent = create(:parent)
 
     @patient =
-      create(:patient, year_group: 8, session: @session, parents: [@parent])
+      create(:patient, year_group: 8, location: @location, parents: [@parent])
 
     clinic_session =
       create(
@@ -114,15 +102,15 @@ def given_my_team_is_running_an_hpv_vaccination_programme
       )
 
     patient_already_in_clinic_without_invitiation =
-      create(:patient, year_group: 8, session: @session)
+      create(:patient, year_group: 8, location: @location)
     create(
       :patient_location,
       patient: patient_already_in_clinic_without_invitiation,
       session: clinic_session
     )
 
     patient_already_in_clinic_with_invitiation =
-      create(:patient, year_group: 8, session: @session)
+      create(:patient, year_group: 8, location: @location)
     create(
       :patient_location,
       patient: patient_already_in_clinic_with_invitiation,
@@ -154,7 +142,7 @@ def when_i_go_to_unscheduled_sessions
     click_on "Update results"
   end
 
-  def when_i_seach_for_the_school
+  def when_i_search_for_the_school
     fill_in "Search", with: @location.name
     click_on "Update results"
   end
@@ -189,16 +177,48 @@ def and_i_see_a_child_in_the_cohort
     expect(page).to have_content("3 children")
   end
 
-  def when_i_click_on_schedule_sessions
-    click_on "Edit session"
-    click_on "Add session dates"
-  end
-
   def and_i_click_on_edit_dates
     click_on "Edit session"
     click_on "Change session dates"
   end
 
+  def when_i_click_on_add_a_new_session
+    click_on "Add a new session"
+  end
+
+  def and_i_choose_the_school
+    expect(page).to have_content("What type of session is this?")
+
+    choose "School"
+    click_on "Continue"
+
+    expect(page).to have_content("Where is this school session taking place?")
+
+    select @location.name
+    click_on "Continue"
+  end
+
+  def and_i_choose_the_programmes
+    expect(page).to have_content(
+      "Which programmes will you run in this session?"
+    )
+
+    check "HPV"
+    click_on "Continue"
+  end
+
+  def and_i_choose_the_year_groups
+    expect(page).to have_content(
+      "Which year groups do you want to invite to this session?"
+    )
+
+    check "Year 8"
+    check "Year 9"
+    check "Year 10"
+    check "Year 11"
+    click_on "Continue"
+  end
+
   def then_i_see_the_dates_page_but_cannot_change
     expect(page).to have_content(
       "Children have attended this session. It cannot be changed."
@@ -256,7 +276,7 @@ def when_i_choose_the_dates
   end
 
   def then_i_see_the_confirmation_page
-    expect(page).to have_content("Edit session")
+    expect(page).to have_content("Check and confirm")
   end
 
   def when_i_click_on_change_programmes
@@ -310,8 +330,8 @@ def and_i_change_consent_reminders_weeks
     click_on "Continue"
   end
 
-  def when_i_save_changes
-    click_on "Save changes"
+  def when_i_save_the_session
+    click_on "Continue"
   end
 
   def then_i_should_see_the_session_details
@@ -320,7 +340,7 @@ def then_i_should_see_the_session_details
   end
 
   def when_the_parent_visits_the_consent_form
-    visit start_parent_interface_consent_forms_path(@session, @programme)
+    visit start_parent_interface_consent_forms_path(Session.last, @programme)
   end
 
   def then_they_can_give_consent
@@ -336,12 +356,12 @@ def and_patients_have_been_seen
       :attendance_record,
       :present,
       patient: @patient,
-      session: @session.reload
+      session: Session.last
     )
   end
 
   def then_they_can_no_longer_give_consent
-    visit start_parent_interface_consent_forms_path(@session, @programme)
+    visit start_parent_interface_consent_forms_path(Session.last, @programme)
     expect(page).to have_content("The deadline for responding has passed")
   end