add extra apply filters button to search page (#8320)

Author: starswan

app/components/filters_component/filters_component.html.slim

@@ -20,3 +20,5 @@
   .filters-component__groups
     - groups.each do |group|
       = group
+
+  = submit_button

spec/system/jobseekers/jobseekers_can_search_for_jobs_spec.rb

@@ -82,17 +82,6 @@
   let!(:expired_job) { create(:vacancy, :expired, job_roles: ["teacher"], job_title: "Maths Teacher", subjects: [], organisations: [school]) }
   let(:per_page) { 2 }
 
-  context "when searching using the mobile search fields" do
-    before do
-      stub_const("Pagy::DEFAULT", Pagy::DEFAULT.merge(items: per_page))
-      visit jobs_path
-      fill_in "Keyword", with: keyword
-      click_on I18n.t("buttons.search")
-    end
-
-    it_behaves_like "a successful search"
-  end
-
   context "when searching using the desktop search field" do
     before do
       stub_const("Pagy::DEFAULT", Pagy::DEFAULT.merge(items: per_page))
@@ -409,7 +398,10 @@
       visit jobs_path
       find('span[title="Teaching & leadership"]').click
       check "Teacher"
-      click_on I18n.t("buttons.apply_filters")
+      # Apply filters
+      within ".filters-component" do
+        first("button").click
+      end
 
       expect_page_to_show_jobs([job1, job2, job3, job4, maths_job1, maths_job2])
       expect_page_not_to_show_jobs([headteacher, deputy_head, senior_leader, teaching_assistant, sendco, it_support, pastoral, other])
@@ -418,7 +410,10 @@
       check "IT support"
       check "Head of year or phase"
       uncheck "Teacher"
-      click_on I18n.t("buttons.apply_filters")
+      # Apply filters
+      within ".filters-component" do
+        first("button").click
+      end
 
       expect_page_to_show_jobs([senior_leader, it_support])
       expect_page_not_to_show_jobs([job1, job2, job3, job4, maths_job1, maths_job2, headteacher, deputy_head, teaching_assistant, sendco, pastoral, other])

spec/system/jobseekers/jobseekers_can_search_for_schools_spec.rb

@@ -69,7 +69,11 @@
     it "allows filtering by schools with vacancies" do
       expect(page).to have_link no_vacancies.name
       check I18n.t("organisations.filters.job_availability.options.true")
-      click_on I18n.t("buttons.apply_filters")
+
+      # Apply filters
+      within ".govuk-grid-column-one-third-at-desktop" do
+        first("button").click
+      end
       expect(page).not_to have_link no_vacancies.name
     end
   end

spec/system/publishers/publishers_can_filter_vacancies_in_their_dashboard_spec.rb

@@ -42,7 +42,10 @@
 
         scenario "it shows filtered published vacancies" do
           check "Happy Rainbows School (1)"
-          click_on I18n.t("buttons.apply_filters")
+          # Apply filters
+          within ".filters-component" do
+            first("button").click
+          end
 
           expect(page).to have_css(".filters-component__remove-tags__tag", count: 1)
 

spec/system/publishers/publishers_can_search_for_jobseeker_profiles_spec.rb

@@ -95,8 +95,9 @@
         check I18n.t("publishers.jobseeker_profiles.filters.working_pattern_options.part_time")
       end
 
+      # Apply filters
       within ".filters-component" do
-        click_on I18n.t("buttons.apply_filters")
+        first("button").click
       end
 
       expect(page).to have_link(href: publishers_jobseeker_profile_path(part_time_jobseeker_profile))
@@ -111,8 +112,9 @@
           check I18n.t("publishers.jobseeker_profiles.filters.right_to_work_in_uk_options.true")
         end
 
+        # Apply filters
         within ".filters-component" do
-          click_on I18n.t("buttons.apply_filters")
+          first("button").click
         end
 
         expect(page).to_not have_link(href: publishers_jobseeker_profile_path(part_time_jobseeker_profile))
@@ -159,7 +161,8 @@
           find('span[title="Support"]').click
           check "Catering, cleaning and site management"
           check "HLTA (higher level teaching assistant)"
-          click_on I18n.t("buttons.apply_filters")
+          # Apply filters
+          first("button").click
         end
 
         expect(page).not_to have_link(href: publishers_jobseeker_profile_path(part_time_jobseeker_profile))
@@ -175,7 +178,8 @@
         within ".filters-component" do
           find('span[title="Teaching & leadership"]').click
           check "Teacher"
-          click_on I18n.t("buttons.apply_filters")
+          # Apply filters
+          first("button").click
         end
 
         expect(page).to have_link(href: publishers_jobseeker_profile_path(part_time_jobseeker_profile))
@@ -214,7 +218,10 @@
     context "when 1 location is selected in the filters" do
       it "shows text explaining that the candidates are willing travel to the selected location" do
         check "Oxford"
-        click_button "Apply filters"
+        # Apply filters
+        within ".filters-component" do
+          first("button").click
+        end
         expect(page).to have_selector("p", text: "These candidates are willing to travel to your selected school location.")
       end
     end
@@ -223,7 +230,10 @@
       it "shows text explaining that the candidates are willing travel to at least one of the selected locations" do
         check "Oxford"
         check "Cambridge"
-        click_button "Apply filters"
+        # Apply filters
+        within ".filters-component" do
+          first("button").click
+        end
         expect(page).to have_selector("p", text: "These candidates are willing to travel to at least one of your selected school locations.")
       end
     end

spec/system/publishers/publishers_can_view_candidate_messages_spec.rb

@@ -26,6 +26,8 @@
     context "when on the inbox tab" do
       before do
         visit publishers_candidate_messages_path
+        # wait for page load
+        find("nav.tabs-component")
       end
 
       it "passes accessibility checks", :a11y do