Merge remote-tracking branch 'upstream/pull/4510'

diff --git a/Gemfile b/Gemfile
index 8dd0576d10ee2c94cfcc870244173f3557ad4f78..63d9c49e808bd71522c11c6af215fe5bb2db4789 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -154,6 +154,7 @@ group :test do
   gem "factory_bot_rails"
   gem "jwt"
   gem "minitest", "~> 5.1"
+  gem "minitest-focus", :require => false
   gem "puma", "~> 5.6"
   gem "rails-controller-testing"
   gem "rubocop"

diff --git a/Gemfile.lock b/Gemfile.lock
index 7e297ae33e8f218e592437b03ff833f5f583806a..32ac9e4188df3b9e58ef1f084350eb4804c093ee 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -334,6 +334,8 @@ GEM
     mini_racer (0.8.0)
       libv8-node (~> 18.16.0.0)
     minitest (5.22.0)
+    minitest-focus (1.4.0)
+      minitest (>= 4, < 6)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -642,6 +644,7 @@ DEPENDENCIES
   marcel
   maxminddb
   minitest (~> 5.1)
+  minitest-focus
   oauth-plugin (>= 0.5.1)
   omniauth (~> 2.0.2)
   omniauth-facebook

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5fe1ada472605d04d25717e032a87a02837e363d..e1bc91917deababfa3aa597fcdc599d08008e356 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -32,6 +32,7 @@ ENV["RAILS_ENV"] = "test"
 require_relative "../config/environment"
 require "rails/test_help"
 require "webmock/minitest"
+require "minitest/focus" unless ENV["CI"]
 
 WebMock.disable_net_connect!(:allow_localhost => true)