Merge pull request #2609 from betagouv/bump-capybara

Bump capybara (2.18.0 → 3.9.0)

Gemfile.lock

@@ -115,17 +115,18 @@ GEM
     browser (2.5.3)
     builder (3.2.3)
     byebug (10.0.2)
-    capybara (2.18.0)
+    capybara (3.11.0)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     capybara-email (3.0.1)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.21)
+    capybara-screenshot (1.0.22)
       capybara (>= 1.0, < 4)
       launchy
     capybara-selenium (0.0.6)
@@ -416,7 +417,7 @@ GEM
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     puma (3.12.0)
     rack (2.0.6)
     rack-handlers (0.7.3)
@@ -476,6 +477,7 @@ GEM
       ffi
     rbnacl-libsodium (1.0.16)
       rbnacl (>= 3.0.1)
+    regexp_parser (1.3.0)
     request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.0)
@@ -643,7 +645,7 @@ GEM
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (3.0.0)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
     xray-rails (0.3.1)
       rails (>= 3.1.0)

spec/controllers/support_controller_spec.rb

@@ -111,7 +111,7 @@ describe SupportController, type: :controller do
         get :index
 
         expect(response.status).to eq(200)
-        expect(response.body).to have_content("Email *")
+        expect(response.body).to have_text("Email")
       end
     end
 

spec/features/new_user/brouillon_spec.rb

@@ -22,7 +22,7 @@ feature 'The user' do
     # fill data
     fill_in('text', with: 'super texte')
     fill_in('textarea', with: 'super textarea')
-    fill_in('date', with: '12/12/2012')
+    fill_in('date', with: '12-12-2012')
     select_date_and_time(Time.zone.parse('06/01/1985 7h05'), form_id_for('datetime'))
     fill_in('number', with: '42')
     check('checkbox')

spec/mailers/avis_mailer_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe AvisMailer, type: :mailer do
     subject { described_class.avis_invitation(avis) }
 
     it { expect(subject.subject).to eq("Donnez votre avis sur le dossier nº #{avis.dossier.id} (#{avis.dossier.procedure.libelle})") }
-    it { expect(subject.body).to have_text("Vous avez été invité par #{avis.claimant.email} à donner votre avis sur le dossier nº #{avis.dossier.id} de la démarche : #{avis.dossier.procedure.libelle}") }
+    it { expect(subject.body).to have_text("Vous avez été invité par\n#{avis.claimant.email}\nà donner votre avis sur le dossier nº #{avis.dossier.id} de la démarche :\n#{avis.dossier.procedure.libelle}") }
     it { expect(subject.body).to include(avis.introduction) }
     it { expect(subject.body).to include(gestionnaire_avis_url(avis)) }
 

spec/spec_helper.rb

@@ -48,6 +48,9 @@ Capybara.register_driver :headless_chrome do |app|
     desired_capabilities: capabilities
 end
 
+# FIXME: remove this line when https://github.com/rspec/rspec-rails/issues/1897 has been fixed
+Capybara.server = :puma, { Silent: true }
+
 Capybara.default_max_wait_time = 2
 
 # Save a snapshot of the HTML page when an integration test fails

spec/views/new_gestionnaire/dossiers/show.html.haml_spec.rb

@@ -10,7 +10,7 @@ describe 'new_gestionnaire/dossiers/show.html.haml', type: :view do
   subject! { render }
 
   it 'renders the header' do
-    expect(rendered).to have_text("Dossier nº #{dossier.id}")
+    expect(rendered).to have_text("Dossier nº #{dossier.id}")
   end
 
   it 'renders the dossier infos' do

spec/views/new_user/dossiers/demande.html.haml_spec.rb

@@ -12,7 +12,7 @@ describe 'new_user/dossiers/demande.html.haml', type: :view do
   subject! { render }
 
   it 'renders the header' do
-    expect(rendered).to have_text("Dossier nº #{dossier.id}")
+    expect(rendered).to have_text("Dossier nº #{dossier.id}")
   end
 
   it 'renders the dossier infos' do

spec/views/new_user/dossiers/show.html.haml_spec.rb

@@ -11,7 +11,7 @@ describe 'new_user/dossiers/show.html.haml', type: :view do
   subject! { render }
 
   it 'renders a summary of the dossier state' do
-    expect(rendered).to have_text("Dossier nº #{dossier.id}")
+    expect(rendered).to have_text("Dossier nº #{dossier.id}")
     expect(rendered).to have_selector('.status-overview')
   end
 

spec/views/new_user/dossiers/show/_header.html.haml_spec.rb

@@ -9,7 +9,7 @@ describe 'new_user/dossiers/show/header.html.haml', type: :view do
 
   it 'affiche les informations du dossier' do
     expect(rendered).to have_text(dossier.procedure.libelle)
-    expect(rendered).to have_text("Dossier nº #{dossier.id}")
+    expect(rendered).to have_text("Dossier nº #{dossier.id}")
     expect(rendered).to have_text("en construction")
 
     expect(rendered).to have_selector("ul.tabs")