From f0e722050c4b1f78583254e34ce9ee081531ac10 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:24:33 +0000 Subject: [PATCH 01/13] Sign in spec doesn't need JS execution --- spec/features/signin_spec.rb | 2 +- spec/rails_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/signin_spec.rb b/spec/features/signin_spec.rb index e0680b191b..f1488ba7ba 100644 --- a/spec/features/signin_spec.rb +++ b/spec/features/signin_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "signin", :js do +describe "signin" do let(:member) { FactoryBot.create(:member) } let(:recipient) { FactoryBot.create(:member) } let(:wrangler) { FactoryBot.create(:crop_wrangling_member) } diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index bd64cd3336..d88aa823a1 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -33,7 +33,7 @@ Capybara.default_driver = ENV["CAPYBARA_DRIVER"].to_sym Capybara.javascript_driver = ENV["CAPYBARA_DRIVER"].to_sym else - Capybara.default_driver = :selenium_chrome_customised_headless + # Capybara.default_driver = :selenium_chrome_customised_headless Capybara.javascript_driver = :selenium_chrome_customised_headless end Capybara.enable_aria_label = true From b42cb14e1b5c69b9fba0508c0dcc85cd09958d61 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:25:51 +0000 Subject: [PATCH 02/13] Sign up spec doesn't need JS execution --- spec/features/signup_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb index 7745370bcb..68ba750a44 100644 --- a/spec/features/signup_spec.rb +++ b/spec/features/signup_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "signup", :js do +describe "signup" do it "sign up for new account from top menubar" do visit crops_path # something other than front page, which has multiple signup links click_link 'Sign up' From 4700c8ff628cc3f5ce0485467b7b7d2ca558a38d Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:26:47 +0000 Subject: [PATCH 03/13] Planting Reminders spec doesn't need JS execution --- spec/features/planting_reminder_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/planting_reminder_spec.rb b/spec/features/planting_reminder_spec.rb index 947c9ca663..396e1ee8b5 100644 --- a/spec/features/planting_reminder_spec.rb +++ b/spec/features/planting_reminder_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' require 'capybara/email/rspec' -describe "Planting reminder email", :js do +describe "Planting reminder email" do let(:member) { create(:member) } let(:mail) { NotifierMailer.planting_reminder(member) } From 690c74b3a54532adbc605c702b501b6909386afe Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:27:23 +0000 Subject: [PATCH 04/13] Locale spec doesn't need JS execution --- spec/features/locale_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/locale_spec.rb b/spec/features/locale_spec.rb index db36837108..c01bc3c3b4 100644 --- a/spec/features/locale_spec.rb +++ b/spec/features/locale_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "Changing locales", :js do +describe "Changing locales" do after { I18n.locale = :en } let(:member) { FactoryBot.create(:member) } From 6e30aca01700327583f26ee19a4b50d699f656ff Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:29:05 +0000 Subject: [PATCH 05/13] Footer spec doesn't need JS execution --- spec/features/footer_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/footer_spec.rb b/spec/features/footer_spec.rb index 147c68a6b0..24960f138e 100644 --- a/spec/features/footer_spec.rb +++ b/spec/features/footer_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "footer", :js do +describe "footer" do before { visit root_path } it "footer is on home page" do From 81af9508c2fe01d40a0d6f7fbb341184e35208ba Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:30:02 +0000 Subject: [PATCH 06/13] Timeline spec doesn't need JS execution --- spec/features/timeline/index_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/timeline/index_spec.rb b/spec/features/timeline/index_spec.rb index 3135bf65a0..d25acf1db2 100644 --- a/spec/features/timeline/index_spec.rb +++ b/spec/features/timeline/index_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "timeline", :js do +describe "timeline" do let(:member) { FactoryBot.create(:member) } let(:friend1) { FactoryBot.create(:member) } let(:friend2) { FactoryBot.create(:member) } From 668925964e290148f4d96f4be7305f2d14c698ff Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:31:37 +0000 Subject: [PATCH 07/13] Prediction spec doesn't need JS execution --- spec/features/plantings/prediction_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/plantings/prediction_spec.rb b/spec/features/plantings/prediction_spec.rb index fa3f409dee..3a25fab15c 100644 --- a/spec/features/plantings/prediction_spec.rb +++ b/spec/features/plantings/prediction_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" require 'custom_matchers' -describe "Display a planting", :js do +describe "Display a planting" do describe 'planting perennial' do let(:garden) { FactoryBot.create(:garden, location: 'Edinburgh') } let(:crop) { FactoryBot.create(:crop, name: 'feijoa', perennial: true) } From 5783a76f1571a407ab013c58972fed856841ab53 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:34:08 +0000 Subject: [PATCH 08/13] Follows spec doesn't need JS execution --- spec/features/members/following_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/members/following_spec.rb b/spec/features/members/following_spec.rb index 4c2f51116f..2f3dbf716b 100644 --- a/spec/features/members/following_spec.rb +++ b/spec/features/members/following_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "follows", :js do +describe "follows" do context "when signed out" do let(:member) { create(:member) } From 07244991055da6e7a86a20838b8db0f8c9bcd671 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:35:14 +0000 Subject: [PATCH 09/13] Profile spec doesn't need JS execution --- spec/features/members/profile_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/features/members/profile_spec.rb b/spec/features/members/profile_spec.rb index 2da6340ac6..e40e26f44a 100644 --- a/spec/features/members/profile_spec.rb +++ b/spec/features/members/profile_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "member profile", :js do +describe "member profile" do let(:member) { create(:member) } let(:other_member) { create(:member) } let(:admin_member) { create(:admin_member) } @@ -227,8 +227,8 @@ end context "not signed in" do - include_examples 'member details' - include_examples 'member activity' + it_behaves_like 'member details' + it_behaves_like 'member activity' it "no bio" do member.update! bio: nil @@ -239,8 +239,8 @@ context "signed in member" do include_context 'signed in member' - include_examples 'member details' - include_examples 'member activity' + it_behaves_like 'member details' + it_behaves_like 'member activity' context "your own profile page" do before { visit member_path(member) } From 804e347be23006185de5d23a5b4a0f73a182e633 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:42:33 +0000 Subject: [PATCH 10/13] Conservations spec doesn't need JS execution --- spec/features/conversations/index_spec.rb | 4 ++-- spec/features/conversations/show_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/features/conversations/index_spec.rb b/spec/features/conversations/index_spec.rb index a5225817cf..f5d4a90f76 100644 --- a/spec/features/conversations/index_spec.rb +++ b/spec/features/conversations/index_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "Conversations", :js do +describe "Conversations" do let(:sender) { create(:member) } let(:recipient) { create(:member, login_name: 'beyonce') } @@ -18,7 +18,7 @@ click_link 'Inbox' end - include_examples 'is accessible' + it_behaves_like 'is accessible' it { expect(page).to have_content 'something i want to say' } it { page.percy_snapshot(page, name: 'conversations#index') } diff --git a/spec/features/conversations/show_spec.rb b/spec/features/conversations/show_spec.rb index 4a670e6722..5a4dc4b782 100644 --- a/spec/features/conversations/show_spec.rb +++ b/spec/features/conversations/show_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' -describe "Conversations", :js do +describe "Conversations" do let(:sender) { create(:member) } let(:recipient) { create(:member, login_name: 'beyonce') } From 7ec8c0bb503691ce1c23d82088ce568e9733a5b2 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:43:26 +0000 Subject: [PATCH 11/13] Adding Garden spec doesn't need JS execution --- spec/features/gardens/adding_gardens_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/gardens/adding_gardens_spec.rb b/spec/features/gardens/adding_gardens_spec.rb index 89e6015794..bf0c2c4914 100644 --- a/spec/features/gardens/adding_gardens_spec.rb +++ b/spec/features/gardens/adding_gardens_spec.rb @@ -3,12 +3,12 @@ require 'rails_helper' require 'custom_matchers' -describe "Gardens", :js do +describe "Gardens" do context 'signed in' do include_context 'signed in member' before { visit new_garden_path } - include_examples 'is accessible' + it_behaves_like 'is accessible' it "displays required and optional fields properly" do expect(page).to have_selector ".required", text: "Name" From 7c56925fefe6401be976f19e92b06a3baffd3566 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:44:19 +0000 Subject: [PATCH 12/13] Garden spec doesn't need JS execution --- spec/features/gardens/index_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/gardens/index_spec.rb b/spec/features/gardens/index_spec.rb index 1b7bfd502f..cb01f73978 100644 --- a/spec/features/gardens/index_spec.rb +++ b/spec/features/gardens/index_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' require 'custom_matchers' -describe "Gardens#index", :js do +describe "Gardens#index" do context "Logged in as member" do include_context 'signed in member' let(:member) { FactoryBot.create(:member, login_name: 'shadow') } @@ -14,7 +14,7 @@ visit member_gardens_path(member_slug: member.slug) end - include_examples 'is accessible' + it_behaves_like 'is accessible' it "displays each of the gardens" do member.gardens.each do |garden| From fd3680c37cbbbd52cfbae5514c983c40b7e240af Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sun, 10 Aug 2025 03:54:16 +0000 Subject: [PATCH 13/13] Add missed commit --- spec/rails_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index d88aa823a1..837a3dc63d 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -50,7 +50,7 @@ # TODO: Find a better home. shared_examples 'is accessible' do - it "is accessible" do + it "is accessible", :js do expect(page).to be_axe_clean.skipping('color-contrast', 'heading-order', 'aria-required-children').according_to :wcag2a end end