Merge pull request #3278 from DFE-Digital/remove-degree-autocomplete

Removing DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED feature flag
DFE-Digital · Sep 30, 2024 · c796da1 · c796da1
2 parents c66bea4 + 423c3b8
commit c796da1
Show file tree

Hide file tree

Showing 32 changed files with 367 additions and 151 deletions.
diff --git a/.env.production b/.env.production
@@ -7,5 +7,3 @@ DFE_SIGNIN_API_ENABLED="1"
 DFE_SIGNIN_API_SCHOOL_CHANGE_ENABLED="1"
 GTM_ID=GTM-W3VGWP6
 BIGQUERY_DATASET=gse_events_production
-
-DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED=1
diff --git a/.env.staging b/.env.staging
@@ -6,5 +6,3 @@ DFE_SIGNIN_API_ENABLED="1"
 DFE_SIGNIN_API_SCHOOL_CHANGE_ENABLED="1"
 GTM_ID=GTM-PN3BPDM
 BIGQUERY_DATASET=gse_events_staging
-
-DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED=1
diff --git a/.env.test b/.env.test
@@ -1,4 +1,2 @@
 # Add public environment variables here for the Test environment
 SECRET_KEY_BASE=stubbed
-
-DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED=1
diff --git a/app/services/candidates/registrations/behaviours/education.rb b/app/services/candidates/registrations/behaviours/education.rb
@@ -14,20 +14,13 @@ module Education
           validates :degree_stage, inclusion: { in: :available_degree_stages }, if: -> { degree_stage.present? }
           validates :degree_stage_explaination, presence: true, if: :degree_stage_explaination_required?
 
-          # if DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED=true (degree_subject_autocomplete?)
-          # + if javascript is disabled (nojs?), then
-          validates :degree_subject_nojs, presence: true, if: -> { degree_subject_autocomplete? && nojs? && degree_stage_requires_subject? }
-          validates :degree_subject_nojs, absence: true,  if: -> { degree_subject_autocomplete? && nojs? && !degree_stage_requires_subject? }
-
-          # # + else if javascript is enabled (js?), then
-          validates :degree_subject, presence: true,  if: -> { degree_subject_autocomplete? && js? && degree_stage_requires_subject? }
-          validates :degree_subject, absence: true,   if: -> { degree_subject_autocomplete? && js? && !degree_stage_requires_subject? }
-
-          # if DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED=false (degree_subject_simple?)
-          validates :degree_subject, presence: true,                                if: -> { degree_subject_simple? && degree_stage_requires_subject? }
-          validates :degree_subject, inclusion: { in: :available_degree_subjects }, if: -> { degree_subject_simple? && degree_stage_requires_subject? }
-          validates :degree_subject, inclusion: [NO_DEGREE_SUBJECT],                if: -> { degree_subject_simple? && degree_stage_requires_n_a_subject? }
-          validates :degree_subject, exclusion: [NO_DEGREE_SUBJECT],                if: -> { degree_subject_simple? && degree_stage_requires_subject_in_subjects_list? }
+          # if javascript is disabled (nojs?), then
+          validates :degree_subject_nojs, presence: true, if: -> { nojs? && degree_stage_requires_subject? }
+          validates :degree_subject_nojs, absence: true,  if: -> { nojs? && !degree_stage_requires_subject? }
+
+          # else if javascript is enabled (js?), then
+          validates :degree_subject, presence: true,  if: -> { js? && degree_stage_requires_subject? }
+          validates :degree_subject, absence: true,   if: -> { js? && !degree_stage_requires_subject? }
         end
 
         def js?
@@ -43,12 +36,7 @@ def available_degree_stages
         end
 
         def available_degree_subjects
-          @available_degree_subjects ||=
-            if degree_subject_autocomplete?
-              DfE::ReferenceData::Degrees::SUBJECTS.all
-            else
-              OPTIONS_CONFIG.fetch 'DEGREE_SUBJECTS'
-            end
+          @available_degree_subjects ||= DfE::ReferenceData::Degrees::SUBJECTS.all
         end
 
         def requires_subject_for_degree_stage?(some_degree_stage)
@@ -63,14 +51,6 @@ def no_degree_subject
           NO_DEGREE_SUBJECT
         end
 
-        def degree_subject_autocomplete?
-          @degree_subject_autocomplete ||= ActiveModel::Type::Boolean.new.cast(ENV.fetch("DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED", false))
-        end
-
-        def degree_subject_simple?
-          !degree_subject_autocomplete?
-        end
-
       private
 
         def degree_stage_requires_subject?

diff --git a/app/views/candidates/registrations/educations/_form.html.erb b/app/views/candidates/registrations/educations/_form.html.erb
@@ -30,46 +30,27 @@
   </section>
 
   <section id="education-degree-subject-container" data-education-form-target="degreeSubjectContainer">
-    <% if f.object.degree_subject_autocomplete? %>
-      <%= f.hidden_field :nojs, value: true, class: 'nojs-flag' %>
-
-      <div id="degree_subject_nojs" class="hide-with-javascript">
-        <!-- no-javascript version of autocomplete box -->
-        <%=f.govuk_text_field :degree_subject_nojs, label: { size: 'm' } %>
-      </div>
-
-      <%= render DfE::Autocomplete::View.new(
-        f,
-        attribute_name: :degree_subject,
-        form_field: f.govuk_select(
-          :degree_subject,
-          options_for_select(dfe_autocomplete_options( f.object.available_degree_subjects), f.object.degree_subject),
-          label: { text: t('helpers.legend.candidates_registrations_education.degree_subject'),  size: 'm', tag: 'h2' },
-          hint: { text: t('helpers.hint.candidates_registrations_education.degree_subject') },
-          data: { education_form_target: 'degreeSubject' },
-          class: "enable-with-javascript",
-          disabled: true,
-          ),
-        classes: "show-with-javascript",
-        ) %>
-    <% else %>
-      <%= f.govuk_collection_select \
-      :degree_subject,
-      f.object.available_degree_subjects,
-      :to_s,
-      :to_s,
-      options: { prompt: "Select" },
-      data: {
-        education_form_target: 'degreeSubject',
-        value_for_no_degree: f.object.no_degree_subject
-      },
-      class: "govuk-select govuk-!-width-one-half",
-      label: { class: "govuk-heading-m" } do %>
-        <p>
-          Select the nearest or equivalent subject.
-        </p>
-      <% end %>
-    <% end %>
+    <%= f.hidden_field :nojs, value: true, class: 'nojs-flag' %>
+
+    <div id="degree_subject_nojs" class="hide-with-javascript">
+      <!-- no-javascript version of autocomplete box -->
+      <%=f.govuk_text_field :degree_subject_nojs, label: { size: 'm' } %>
+    </div>
+
+    <%= render DfE::Autocomplete::View.new(
+      f,
+      attribute_name: :degree_subject,
+      form_field: f.govuk_select(
+        :degree_subject,
+        options_for_select(dfe_autocomplete_options( f.object.available_degree_subjects), f.object.degree_subject),
+        label: { text: t('helpers.legend.candidates_registrations_education.degree_subject'),  size: 'm', tag: 'h2' },
+        hint: { text: t('helpers.hint.candidates_registrations_education.degree_subject') },
+        data: { education_form_target: 'degreeSubject' },
+        class: "enable-with-javascript",
+        disabled: true,
+        ),
+      classes: "show-with-javascript",
+      ) %>
   </section>
 
   <%= f.govuk_submit 'Continue' %>

diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
   "devDependencies": {
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "webpack-dev-server": "4"
   },
   "jest": {

diff --git a/spec/controllers/candidates/registrations/background_checks_controller_spec.rb b/spec/controllers/candidates/registrations/background_checks_controller_spec.rb
@@ -2,7 +2,6 @@
 
 describe Candidates::Registrations::BackgroundChecksController, type: :request do
   include_context 'Stubbed current_registration'
-  include_context "Degree subject autocomplete enabled"
 
   before do
     FactoryBot.create :bookings_school, urn: 11_048

diff --git a/spec/controllers/candidates/registrations/confirmation_emails_controller_spec.rb b/spec/controllers/candidates/registrations/confirmation_emails_controller_spec.rb
@@ -3,7 +3,6 @@
 describe Candidates::Registrations::ConfirmationEmailsController, type: :request do
   include_context 'Stubbed candidates school'
   include_context 'Stubbed current_registration'
-  include_context "Degree subject autocomplete enabled"
 
   let :registration_session do
     FactoryBot.build :registration_session, urn: school.urn,

diff --git a/spec/controllers/candidates/registrations/educations_controller_spec.rb b/spec/controllers/candidates/registrations/educations_controller_spec.rb
@@ -2,7 +2,6 @@
 
 describe Candidates::Registrations::EducationsController, type: :request do
   include_context 'Stubbed current_registration'
-  include_context "Degree subject autocomplete enabled"
 
   let :registration_session do
     FactoryBot.build :registration_session, with: %i[

diff --git a/spec/controllers/candidates/registrations/placement_preferences_controller_spec.rb b/spec/controllers/candidates/registrations/placement_preferences_controller_spec.rb
@@ -3,7 +3,6 @@
 describe Candidates::Registrations::PlacementPreferencesController, type: :request do
   include_context 'Stubbed candidates school'
   include_context 'Stubbed current_registration'
-  include_context "Degree subject autocomplete enabled"
 
   let :registration_session do
     FactoryBot.build :registration_session, with: %i[

diff --git a/spec/controllers/schools/archived_placement_requests_controller_spec.rb b/spec/controllers/schools/archived_placement_requests_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::ArchivedPlacementRequestsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let(:school) { Bookings::School.find_by! urn: urn }
   let!(:profile) { create :bookings_profile, school: school }

diff --git a/spec/controllers/schools/attendances_controller_spec.rb b/spec/controllers/schools/attendances_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::AttendancesController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let! :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/cancelled_bookings_controller_spec.rb b/spec/controllers/schools/cancelled_bookings_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::CancelledBookingsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let! :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/confirm_attendance_controller_spec.rb b/spec/controllers/schools/confirm_attendance_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::ConfirmAttendanceController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let(:school) { Bookings::School.find_by(urn: urn) }
   let!(:profile) { create(:bookings_profile, school: school) }

diff --git a/...llers/schools/confirmed_bookings/cancellations/notification_deliveries_controller_spec.rb b/...llers/schools/confirmed_bookings/cancellations/notification_deliveries_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::ConfirmedBookings::Cancellations::NotificationDeliveriesController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/confirmed_bookings/cancellations_controller_spec.rb b/spec/controllers/schools/confirmed_bookings/cancellations_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::ConfirmedBookings::CancellationsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/confirmed_bookings/date_controller_spec.rb b/spec/controllers/schools/confirmed_bookings/date_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::ConfirmedBookings::DateController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let(:booking) do
     create(:bookings_booking, :accepted, bookings_school: @current_user_school)

diff --git a/spec/controllers/schools/confirmed_bookings_controller_spec.rb b/spec/controllers/schools/confirmed_bookings_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::ConfirmedBookingsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let! :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/placement_requests/acceptance/confirm_booking_controller_spec.rb b/spec/controllers/schools/placement_requests/acceptance/confirm_booking_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PlacementRequests::Acceptance::ConfirmBookingController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let!(:pr) { create(:bookings_placement_request, school: @current_user_school) }
   before { create(:bookings_profile, school: @current_user_school) }

diff --git a/spec/controllers/schools/placement_requests/acceptance/make_changes_controller_spec.rb b/spec/controllers/schools/placement_requests/acceptance/make_changes_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PlacementRequests::Acceptance::MakeChangesController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let!(:pr) { create(:bookings_placement_request, school: @current_user_school) }
 

diff --git a/...llers/schools/placement_requests/acceptance/preview_confirmation_email_controller_spec.rb b/...llers/schools/placement_requests/acceptance/preview_confirmation_email_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PlacementRequests::Acceptance::PreviewConfirmationEmailController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school_experience do
     instance_double(Bookings::Gitis::SchoolExperience)

diff --git a/...llers/schools/placement_requests/cancellations/notification_deliveries_controller_spec.rb b/...llers/schools/placement_requests/cancellations/notification_deliveries_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PlacementRequests::Cancellations::NotificationDeliveriesController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/placement_requests/cancellations_controller_spec.rb b/spec/controllers/schools/placement_requests/cancellations_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PlacementRequests::CancellationsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/placement_requests/past_attendance_controller_spec.rb b/spec/controllers/schools/placement_requests/past_attendance_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PlacementRequests::PastAttendanceController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let(:school) { Bookings::School.find_by! urn: urn }
   let!(:profile) { create :bookings_profile, school: school }

diff --git a/spec/controllers/schools/placement_requests/under_consideration_controller_spec.rb b/spec/controllers/schools/placement_requests/under_consideration_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PlacementRequests::UnderConsiderationController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   describe '#place_under_consideration' do
     include_context "logged in DfE user"

diff --git a/spec/controllers/schools/placement_requests_controller_spec.rb b/spec/controllers/schools/placement_requests_controller_spec.rb
@@ -4,7 +4,6 @@
 describe Schools::PlacementRequestsController, type: :request do
   include ActiveSupport::Testing::TimeHelpers
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school do
     Bookings::School.find_by! urn: urn

diff --git a/spec/controllers/schools/previous_bookings_controller_spec.rb b/spec/controllers/schools/previous_bookings_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::PreviousBookingsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let! :school do
     Bookings::School.find_by!(urn: urn).tap do |s|

diff --git a/spec/controllers/schools/rejected_requests_controller_spec.rb b/spec/controllers/schools/rejected_requests_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::RejectedRequestsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school do
     Bookings::School.find_by!(urn: urn).tap do |school|

diff --git a/spec/controllers/schools/withdrawn_requests_controller_spec.rb b/spec/controllers/schools/withdrawn_requests_controller_spec.rb
@@ -3,7 +3,6 @@
 
 describe Schools::WithdrawnRequestsController, type: :request do
   include_context "logged in DfE user"
-  include_context "Degree subject autocomplete enabled"
 
   let :school do
     Bookings::School.find_by!(urn: urn).tap do |school|

diff --git a/spec/services/candidates/registrations/education_spec.rb b/spec/services/candidates/registrations/education_spec.rb
@@ -77,35 +77,4 @@
       end
     end
   end
-
-  describe '#degree_subject_autocomplete?' do
-    before do
-      allow(ENV).to receive(:fetch).and_call_original
-      allow(ENV).to receive(:fetch).with("DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED", false).and_return(degree_subject_autocomplete_flag)
-    end
-
-    context "when DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED is not set" do
-      let(:degree_subject_autocomplete_flag) { nil }
-
-      it "returns false" do
-        expect(subject).not_to be_degree_subject_autocomplete
-      end
-    end
-
-    context "when DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED=0" do
-      let(:degree_subject_autocomplete_flag) { "0" }
-
-      it "returns false" do
-        expect(subject).not_to be_degree_subject_autocomplete
-      end
-    end
-
-    context "when DEGREE_SUBJECT_AUTOCOMPLETE_ENABLED=1" do
-      let(:degree_subject_autocomplete_flag) { "1" }
-
-      it "returns true" do
-        expect(subject).to be_degree_subject_autocomplete
-      end
-    end
-  end
 end
diff --git a/spec/support/degree_subject_autocomplete.rb b/spec/support/degree_subject_autocomplete.rb