Merge pull request #3788 from consul/dependabot/bundler/capybara-3.29.0

Bump capybara from 2.17.0 to 3.29.0

Gemfile

@@ -79,7 +79,7 @@ group :development, :test do
 end
 
 group :test do
-  gem "capybara", "~> 2.17.0"
+  gem "capybara", "~> 3.29.0"
   gem "capybara-webmock", "~> 0.5.3"
   gem "coveralls", "~> 0.8.22", require: false
   gem "database_cleaner", "~> 1.7.0"

Gemfile.lock

@@ -114,13 +114,14 @@ GEM
       capistrano (~> 3.7)
       capistrano-bundler
       puma (~> 4.0)
-    capybara (2.17.0)
+    capybara (3.29.0)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
+      nokogiri (~> 1.8)
-      rack (>= 1.0.0)
+      rack (>= 1.6.0)
-      rack-test (>= 0.5.4)
+      rack-test (>= 0.6.3)
-      xpath (>= 2.0, < 4.0)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
     capybara-webmock (0.5.3)
       capybara (>= 2.4, < 4)
       rack (>= 1.4)
@@ -447,6 +448,7 @@ GEM
       mail
     redcarpet (3.4.0)
     referer-parser (0.3.0)
+    regexp_parser (1.6.0)
     request_store (1.4.0)
       rack (>= 1.4)
     responders (2.4.1)
@@ -594,7 +596,7 @@ GEM
       chronic (>= 0.6.3)
     wicked_pdf (1.1.0)
     wkhtmltopdf-binary (0.12.4)
-    xpath (3.0.0)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -615,7 +617,7 @@ DEPENDENCIES
   capistrano-rails (~> 1.4.0)
   capistrano3-delayed-job (~> 1.7.3)
   capistrano3-puma (~> 4.0.0)
-  capybara (~> 2.17.0)
+  capybara (~> 3.29.0)
   capybara-webmock (~> 0.5.3)
   ckeditor (~> 4.3.0)
   cocoon (~> 1.2.9)

spec/features/budget_polls/ballot_sheets_spec.rb

@@ -142,7 +142,7 @@ describe "Poll budget ballot sheets" do
       set_officing_booth(booth)
     end
 
-    scenario "Ballot sheet information is displayed" do
+    scenario "Ballot sheet information is displayed", :js do
       officer_assignment = create(:poll_officer_assignment, officer: poll_officer)
       ballot_sheet = create(:poll_ballot_sheet, poll: poll, officer_assignment: officer_assignment)
 

spec/features/legislation/proposals_spec.rb

@@ -72,12 +72,12 @@ describe "Legislation Proposals" do
 
       click_link "Next"
 
-      expect(page).to have_content "You're on page 2"
+      expect(page).to have_content "You're on page\n2"
       expect(first_page_proposals_order & legislation_proposals_order).to eq([])
 
       click_link "Previous"
 
-      expect(page).to have_content "You're on page 1"
+      expect(page).to have_content "You're on page\n1"
       expect(legislation_proposals_order).to eq(first_page_proposals_order)
     end
 

spec/shared/features/followable.rb

@@ -55,14 +55,13 @@ shared_examples "followable" do |followable_class_name, followable_path, followa
     scenario "Should display new follower notice after user clicks on follow button", :js do
       user = create(:user)
       login_as(user)
-      create_notice_message = t("shared.followable.#{followable_class_name}.create.notice")
 
       visit send(followable_path, arguments)
       within "##{dom_id(followable)}" do
         click_link("Follow #{followable.model_name.human.downcase}")
       end
 
-      expect(page).to have_content strip_tags(create_notice_message)
+      expect(page).to have_content "We will notify you of changes as they occur"
     end
 
     scenario "Display unfollow button when user already following" do
@@ -90,14 +89,13 @@ shared_examples "followable" do |followable_class_name, followable_path, followa
     scenario "Should display destroy follower notice after user clicks on unfollow button", :js do
       user = create(:user, followables: [followable])
       login_as(user)
-      destroy_notice_message = t("shared.followable.#{followable_class_name}.destroy.notice")
 
       visit send(followable_path, arguments)
       within "##{dom_id(followable)}" do
         click_link("Unfollow #{followable.model_name.human.downcase}")
       end
 
-      expect(page).to have_content strip_tags(destroy_notice_message)
+      expect(page).to have_content "You will no longer receive notifications"
     end
   end
 end