update capybara and cucumber-rails

4 files changed, 63 insertions, 37 deletions

diff --git a/Gemfile b/Gemfile
index d00735331..01b4eea3f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -274,8 +274,8 @@ group :test do
   # Cucumber (integration tests)
 
   gem "apparition",       "0.6.0"
-  gem "capybara",         "3.15.0"
-  gem "database_cleaner", "1.8.3"
+  gem "capybara",         "3.35.3"
+  gem "database_cleaner-active_record", "1.8.0"
 
   gem "cucumber-api-steps", "0.14", require: false
 
@@ -294,7 +294,7 @@ group :development, :test do
   gem "rspec-rails", "3.9.1"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "2.0.0", require: false
+  gem "cucumber-rails", "2.3.0", require: false
 
   # Jasmine (client side application tests (JS))
   gem "chrome_remote",             "0.3.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 03d2ed061..ef26a8946 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,6 @@ GEM
     attr_required (1.0.1)
     autoprefixer-rails (10.2.4.0)
       execjs
-    backports (3.17.0)
     bcrypt (3.1.16)
     bindata (2.4.6)
     bootstrap-sass (3.4.1)
@@ -82,13 +81,13 @@ GEM
     buftok (0.2.0)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.15.0)
+    capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     carrierwave (1.3.1)
       activemodel (>= 4.0.0)
@@ -142,32 +141,50 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
+    cucumber (5.3.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-create-meta (~> 2.0, >= 2.0.2)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-html-formatter (~> 9.0, >= 9.0.0)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      cucumber-wire (~> 4.0, >= 4.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.1)
     cucumber-api-steps (0.14.0)
       cucumber (>= 2.0.2)
       jsonpath (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-rails (2.0.0)
-      capybara (>= 2.12, < 4)
-      cucumber (>= 3.0.2, < 4)
-      mime-types (>= 2.0, < 4)
+    cucumber-core (8.0.1)
+      cucumber-gherkin (~> 15.0, >= 15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-create-meta (2.0.4)
+      cucumber-messages (~> 13.1, >= 13.1.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (15.0.2)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-html-formatter (9.0.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    cucumber-messages (13.2.1)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-rails (2.3.0)
+      capybara (>= 2.18, < 4)
+      cucumber (>= 3.0.2, < 6)
+      mime-types (~> 3.2)
       nokogiri (~> 1.8)
-      railties (>= 4.2, < 7)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    database_cleaner (1.8.3)
+      railties (>= 5.0, < 7)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (4.0.1)
+      cucumber-core (~> 8.0, >= 8.0.1)
+      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
+      cucumber-messages (~> 13.0, >= 13.0.1)
+    database_cleaner (1.8.5)
+    database_cleaner-active_record (1.8.0)
+      activerecord
+      database_cleaner (~> 1.8.0)
     devise (4.7.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -198,7 +215,7 @@ GEM
       diaspora_federation (= 0.2.6)
       fabrication (~> 2.16)
       uuid (~> 2.3, >= 2.3.8)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -269,7 +286,6 @@ GEM
       ruby-progressbar (~> 1.4)
     get_process_mem (0.2.5)
       ffi (~> 1.0)
-    gherkin (5.1.0)
     gitlab (4.14.0)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
@@ -378,9 +394,10 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (1.0.0)
+    middleware (0.1.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types-data (3.2021.0225)
     mini_magick (4.10.1)
     mini_mime (1.1.0)
     mini_portile2 (2.5.0)
@@ -388,7 +405,7 @@ GEM
     mobile-fu (1.4.0)
       rack-mobile-detect
       rails
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multi_test (0.1.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -463,6 +480,11 @@ GEM
     pronto-scss (0.10.0)
       pronto (~> 0.10.0)
       scss_lint (~> 0.43, >= 0.43.0)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -580,7 +602,7 @@ GEM
       ffi (~> 1.0)
     redcarpet (3.5.1)
     redis (4.2.5)
-    regexp_parser (1.7.0)
+    regexp_parser (2.1.1)
     request_store (1.5.0)
       rack (>= 1.4)
     responders (3.0.1)
@@ -678,6 +700,8 @@ GEM
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
     sysexits (1.2.0)
     systemu (2.6.5)
     temple (0.8.2)
@@ -765,14 +789,14 @@ DEPENDENCIES
   autoprefixer-rails (= 10.2.4.0)
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.5)
-  capybara (= 3.15.0)
+  capybara (= 3.35.3)
   carrierwave (= 1.3.1)
   chrome_remote (= 0.3.0)
   compass-rails (= 3.1.0)
   configurate (= 0.5.0)
   cucumber-api-steps (= 0.14)
-  cucumber-rails (= 2.0.0)
-  database_cleaner (= 1.8.3)
+  cucumber-rails (= 2.3.0)
+  database_cleaner-active_record (= 1.8.0)
   devise (= 4.7.3)
   devise-two-factor (= 4.0.0)
   devise_lastseenable (= 0.0.6)
diff --git a/features/support/env.rb b/features/support/env.rb
index 1d67651d3..d8cfcbd3a 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -7,6 +7,7 @@ ENV["RAILS_ENV"] ||= "test"
 # Have all rests run with english browser locale
 ENV["LANG"] = "C"
 
+require "database_cleaner/active_record"
 require "cucumber/rails"
 
 require "capybara/rails"
@@ -52,6 +53,7 @@ Capybara.default_max_wait_time = 30
 # of your scenarios, as this makes it hard to discover errors in your application.
 ActionController::Base.allow_rescue = false
 
+DatabaseCleaner.strategy = :truncation
 Cucumber::Rails::Database.autorun_database_cleaner = true
 Cucumber::Rails::World.use_transactional_tests = false
 
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index 815d35f6a..068d3ddbf 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -20,7 +20,7 @@ begin
       t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
-      t.cucumber_opts = %w[--retry 3 --no-strict-flaky --fail-fast]
+      t.cucumber_opts = %w[--retry 3 --no-strict-flaky --fail-fast --publish-quiet]
     end
 
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|