From 2d0ed269dbeedc7e7d23dec22692ecc75e9702b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 03:52:28 +0000 Subject: [PATCH 1/2] Bump site_prism from 4.0.3 to 5.0 Bumps [site_prism](https://github.com/site-prism/site_prism) from 4.0.3 to 5.0. - [Release notes](https://github.com/site-prism/site_prism/releases) - [Changelog](https://github.com/site-prism/site_prism/blob/main/CHANGELOG.md) - [Commits](https://github.com/site-prism/site_prism/compare/v4.0.3...v5.0) --- updated-dependencies: - dependency-name: site_prism dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 3c2521742c..418d376467 100644 --- a/Gemfile +++ b/Gemfile @@ -242,7 +242,7 @@ group :test do gem 'simplecov', '< 0.23', require: false # Page objects - gem 'site_prism', '~> 4.0' + gem 'site_prism', '~> 5.0' gem 'webmock' diff --git a/Gemfile.lock b/Gemfile.lock index 70c28f87e6..862a0a9e76 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -674,11 +674,11 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - site_prism (4.0.3) - addressable (~> 2.8) - capybara (~> 3.27) - site_prism-all_there (~> 2.0) - site_prism-all_there (2.0.1) + site_prism (5.0) + addressable (~> 2.8, >= 2.8.1) + capybara (~> 3.31) + site_prism-all_there (> 2, < 5) + site_prism-all_there (3.0.2) skylight (6.0.1) activesupport (>= 5.2.0) smart_properties (1.17.0) @@ -846,7 +846,7 @@ DEPENDENCIES sidekiq sidekiq-cron simplecov (< 0.23) - site_prism (~> 4.0) + site_prism (~> 5.0) skylight spring spring-commands-rspec From b03d537a829dee4d6acf023cd1f97e7597841016 Mon Sep 17 00:00:00 2001 From: James Glenn <47917431+JR-G@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:23:27 +0000 Subject: [PATCH 2/2] Avoid invalid prefix --- .../courses/editing_degree_requirements_spec.rb | 14 +++++++------- .../courses/edit_engineers_teach_physics.rb | 2 +- .../publish/courses/new_engineers_teach_physics.rb | 2 +- spec/support/page_objects/publish/degree_start.rb | 4 ++-- .../publish/degree_subject_requirement.rb | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/features/publish/courses/editing_degree_requirements_spec.rb b/spec/features/publish/courses/editing_degree_requirements_spec.rb index 033ee4fd64..16b60924ac 100644 --- a/spec/features/publish/courses/editing_degree_requirements_spec.rb +++ b/spec/features/publish/courses/editing_degree_requirements_spec.rb @@ -130,8 +130,8 @@ expect(publish_degree_subject_requirement_page.copy_content_warning).to have_content(name) end - expect(publish_degree_subject_requirement_page.yes_radio).to be_checked - expect(publish_degree_subject_requirement_page.no_radio).not_to be_checked + expect(publish_degree_subject_requirement_page.radio_yes).to be_checked + expect(publish_degree_subject_requirement_page.radio_no).not_to be_checked expect(publish_degree_subject_requirement_page.requirements.text).to eq(course2.degree_subject_requirements) end @@ -174,12 +174,12 @@ def when_i_visit_the_degrees_subject_requirements_page end def and_i_require_a_classification - publish_degree_start_page.yes_radio.choose + publish_degree_start_page.radio_yes.choose and_i_submit end def and_i_do_not_require_a_classification - publish_degree_start_page.no_radio.choose + publish_degree_start_page.radio_no.choose and_i_submit end @@ -199,7 +199,7 @@ def then_i_should_see_the_subject_requirements_page def when_i_set_additional_requirements @some_additional_requiremet = 'Some additional requirement' - publish_degree_subject_requirement_page.yes_radio.choose + publish_degree_subject_requirement_page.radio_yes.choose publish_degree_subject_requirement_page.requirements.set(@some_additional_requiremet) and_i_submit end @@ -224,7 +224,7 @@ def and_the_required_grade_is_updated_with(grade) end def then_the_start_page_should_show_the_selected_classification - expect(publish_degree_start_page.yes_radio).to be_checked + expect(publish_degree_start_page.radio_yes).to be_checked end def then_the_grade_page_should_show_the_selected_grade @@ -232,7 +232,7 @@ def then_the_grade_page_should_show_the_selected_grade end def then_the_subject_requirements_page_should_show_the_requirements - expect(publish_degree_subject_requirement_page.yes_radio).to be_checked + expect(publish_degree_subject_requirement_page.radio_yes).to be_checked expect(publish_degree_subject_requirement_page.requirements.value).to eq('Maths A Level') end diff --git a/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb b/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb index 0a3ee58466..0df9a9dbea 100644 --- a/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb +++ b/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb @@ -8,7 +8,7 @@ class EditEngineersTeachPhysics < PageObjects::Base section :campaign_fields, '[data-qa="course__engineers_teach_physics_radio_group"]' do element :engineers_teach_physics, '[data-qa="course__campaign_name_engineers_teach_physics_radio"]' - element :no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]' + element :selected_no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]' end element :continue, '[data-qa="course__save"]' diff --git a/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb b/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb index 155d958178..953fb9d302 100644 --- a/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb +++ b/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb @@ -8,7 +8,7 @@ class NewEngineersTeachPhysics < PageObjects::Base section :campaign_fields, '[data-qa="course__engineers_teach_physics_radio_group"]' do element :engineers_teach_physics, '[data-qa="course__campaign_name_engineers_teach_physics_radio"]' - element :no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]' + element :selected_no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]' end element :continue, '[data-qa="course__save"]' diff --git a/spec/support/page_objects/publish/degree_start.rb b/spec/support/page_objects/publish/degree_start.rb index ef0dbbda3c..f0e7f76c77 100644 --- a/spec/support/page_objects/publish/degree_start.rb +++ b/spec/support/page_objects/publish/degree_start.rb @@ -9,8 +9,8 @@ class DegreeStart < PageObjects::Base sections :errors, Sections::ErrorLink, '.govuk-error-summary__list li>a' - element :yes_radio, '[data-qa="start__yes_radio"]' - element :no_radio, '[data-qa="start__no_radio"]' + element :radio_yes, '[data-qa="start__yes_radio"]' + element :radio_no, '[data-qa="start__no_radio"]' element :submit, 'button.govuk-button[type="submit"]' diff --git a/spec/support/page_objects/publish/degree_subject_requirement.rb b/spec/support/page_objects/publish/degree_subject_requirement.rb index 0f7bcf83a8..b2b236fecb 100644 --- a/spec/support/page_objects/publish/degree_subject_requirement.rb +++ b/spec/support/page_objects/publish/degree_subject_requirement.rb @@ -11,8 +11,8 @@ class DegreeSubjectRequirement < PageObjects::Base sections :errors, Sections::ErrorLink, '.govuk-error-summary__list li>a' element :copy_content_warning, '[data-qa="copy-course-warning"]' - element :yes_radio, '[data-qa="degree_subject_requirements__yes_radio"]' - element :no_radio, '[data-qa="degree_subject_requirements__no_radio"]' + element :radio_yes, '[data-qa="degree_subject_requirements__yes_radio"]' + element :radio_no, '[data-qa="degree_subject_requirements__no_radio"]' element :requirements, '[data-qa="degree_subject_requirements__requirements"]' element :use_content, '[data-qa="course__use_content"]'