Merge branch 'dev' into no-js

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 @@ describe "Conversations", :js do
       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') }

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') }
 

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"

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 @@ describe "Gardens#index", :js do
         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|

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) }

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) }
 

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)          }

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) }
 

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) }

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) }

spec/rails_helper.rb

@@ -33,7 +33,7 @@ if ENV["CAPYBARA_DRIVER"]
   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
@@ -50,7 +50,7 @@ Capybara.server_port = 8081
 
 # 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