From dea132667e158b9883e4e9767e1875f97d6075ce Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 16 Jul 2024 13:56:59 +0100 Subject: [PATCH 1/2] [2039] Activate TDA and rollover in all environments --- config/settings.yml | 4 ++-- config/settings/production_aks.yml | 7 ------- config/settings/qa_aks.yml | 1 - config/settings/review_aks.yml | 3 --- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/config/settings.yml b/config/settings.yml index b046f4009b..065337e596 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -93,14 +93,14 @@ feedback: link: https://forms.office.com/pages/responsepage.aspx?id=yXfS-grGoU2187O4s0qC-SKECobyE75EtuJMp8rYxZtURTNaTTJaTVhBQlQzM1RESTJDVlBERk1JQS4u features: - teacher_degree_apprenticeship: false + teacher_degree_apprenticeship: true send_request_data_to_bigquery: false rollover: # Normally a short period of time between rollover and the next cycle # actually starting when it would be set to false has_current_cycle_started?: true # During rollover providers should be able to edit current & next recruitment cycle courses - can_edit_current_and_next_cycles: false + can_edit_current_and_next_cycles: true cookies: session: diff --git a/config/settings/production_aks.yml b/config/settings/production_aks.yml index e6bd7074c0..8c67d17b45 100644 --- a/config/settings/production_aks.yml +++ b/config/settings/production_aks.yml @@ -39,13 +39,6 @@ google_tag_manager: features: send_request_data_to_bigquery: true - teacher_degree_apprenticeship: true - rollover: - # Normally a short period of time between rollover and the next cycle - # actually starting when it would be set to false - has_current_cycle_started?: true - # During rollover providers should be able to edit current & next recruitment cycle courses - can_edit_current_and_next_cycles: true find_valid_referers: - https://www.find-postgraduate-teacher-training.service.gov.uk diff --git a/config/settings/qa_aks.yml b/config/settings/qa_aks.yml index 3afd69a5fe..c3ac991fe7 100644 --- a/config/settings/qa_aks.yml +++ b/config/settings/qa_aks.yml @@ -31,7 +31,6 @@ basic_auth: features: send_request_data_to_bigquery: true - teacher_degree_apprenticeship: true find_valid_referers: - https://qa.find-postgraduate-teacher-training.service.gov.uk diff --git a/config/settings/review_aks.yml b/config/settings/review_aks.yml index 902780c319..1e49db56d4 100644 --- a/config/settings/review_aks.yml +++ b/config/settings/review_aks.yml @@ -12,9 +12,6 @@ apply_base_url: https://qa.apply-for-teacher-training.service.gov.uk search_ui: base_url: https://qa.find-postgraduate-teacher-training.service.gov.uk -features: - teacher_degree_apprenticeship: true - authentication: secret: secret mode: persona From 5568f1ee6513967a9241bb07843fcee4fc3df330 Mon Sep 17 00:00:00 2001 From: Avin Hurry Date: Tue, 16 Jul 2024 14:36:23 +0100 Subject: [PATCH 2/2] Fix failing tests --- .../courses/editing_a_levels_tda_course_spec.rb | 12 ++++++------ .../publish/editing_notification_preference_spec.rb | 2 +- spec/models/concerns/courses/edit_options_spec.rb | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/features/publish/courses/editing_a_levels_tda_course_spec.rb b/spec/features/publish/courses/editing_a_levels_tda_course_spec.rb index 6280e7e696..f1aa99d87f 100644 --- a/spec/features/publish/courses/editing_a_levels_tda_course_spec.rb +++ b/spec/features/publish/courses/editing_a_levels_tda_course_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -feature 'Adding A levels to a teacher degree apprenticeship course', :can_edit_current_and_next_cycles do +feature 'Adding A levels to a teacher degree apprenticeship course', { can_edit_current_and_next_cycles: false } do scenario 'adding a level requirements' do given_i_am_authenticated_as_a_provider_user and_the_tda_feature_flag_is_active @@ -26,13 +26,13 @@ and_i_add_a_minimum_grade_required and_i_click_continue - then_i_see_the_subject_i_choosen + then_i_see_the_subject_i_selected and_i_am_on_the_add_another_a_level_subject_page and_i_see_the_success_message_that_i_added_an_a_level when_i_click_continue then_i_see_an_error_message_for_the_add_a_level_to_a_list_page - and_i_see_the_subject_i_choosen + and_i_see_the_subject_i_selected when_i_choose_yes and_i_click_continue @@ -257,7 +257,7 @@ def and_i_add_a_minimum_grade_required fill_in 'Minimum grade required (optional)', with: 'C' end - def then_i_see_the_subject_i_choosen + def then_i_see_the_subject_i_selected expect(page).to have_current_path( publish_provider_recruitment_cycle_course_a_levels_add_a_level_to_a_list_path( @provider.provider_code, @@ -268,7 +268,7 @@ def then_i_see_the_subject_i_choosen ) expect(page).to have_content('Any subject - Grade C or above') end - alias_method :and_i_see_the_subject_i_choosen, :then_i_see_the_subject_i_choosen + alias_method :and_i_see_the_subject_i_selected, :then_i_see_the_subject_i_selected def then_i_see_an_error_message_for_the_add_a_level_to_a_list_page and_i_see_there_is_a_problem @@ -284,7 +284,7 @@ def when_i_choose_any_stem_subject end def then_i_see_the_two_subjects_i_already_added - and_i_see_the_subject_i_choosen + and_i_see_the_subject_i_selected expect(page).to have_content('Any STEM subject - Grade C or above') end diff --git a/spec/features/publish/editing_notification_preference_spec.rb b/spec/features/publish/editing_notification_preference_spec.rb index 7ea8aaa98f..464ec2da30 100644 --- a/spec/features/publish/editing_notification_preference_spec.rb +++ b/spec/features/publish/editing_notification_preference_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -feature 'Opting into notifications' do +feature 'Opting into notifications', { can_edit_current_and_next_cycles: false } do before do given_i_am_authenticated_as_an_accredited_provider_user when_i_visit_accredited_provider_page diff --git a/spec/models/concerns/courses/edit_options_spec.rb b/spec/models/concerns/courses/edit_options_spec.rb index e45e97feef..a1e4b10935 100644 --- a/spec/models/concerns/courses/edit_options_spec.rb +++ b/spec/models/concerns/courses/edit_options_spec.rb @@ -80,7 +80,7 @@ context "for a course that's not further education" do it 'returns only QTS options for users to choose between' do - expect(course.qualification_options).to eq(%w[qts pgce_with_qts pgde_with_qts]) + expect(course.qualification_options).to eq(%w[qts pgce_with_qts pgde_with_qts undergraduate_degree_with_qts]) course.qualification_options.each do |q| expect(q.include?('qts')).to be_truthy end