From 364756c15c085a5157c7fbbc49aa615486993dfb Mon Sep 17 00:00:00 2001 From: James Mead <james@floehopper.org> Date: Sat, 7 Apr 2018 12:18:33 +0100 Subject: Simplify declaration of mocha dependency in Gemfile The `require: false` option hasn't been needed since Mocha v1.0. --- Gemfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0730c1e9b0..6ae11c1fb2 100644 --- a/Gemfile +++ b/Gemfile @@ -9,9 +9,7 @@ gemspec # We need a newish Rake since Active Job sets its test tasks' descriptions. gem "rake", ">= 11.1" -# This needs to be with require false to ensure correct loading order, as it has to -# be loaded after loading the test library. -gem "mocha", require: false +gem "mocha" gem "capybara", ">= 2.15", "< 4.0" -- cgit v1.2.3 From 30735ab7261db54209a7dca3410236abfbc997e0 Mon Sep 17 00:00:00 2001 From: James Mead <james@floehopper.org> Date: Sat, 7 Apr 2018 12:23:40 +0100 Subject: Make Mocha setup explcitly Minitest-specific This has been possible since Mocha v1.0 and makes it clear that we want Mocha to integrate with Minitest, not Test::Unit. --- actioncable/test/test_helper.rb | 2 +- activerecord/test/cases/helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb index 2a4611fb37..2f186b7193 100644 --- a/actioncable/test/test_helper.rb +++ b/actioncable/test/test_helper.rb @@ -4,7 +4,7 @@ require "action_cable" require "active_support/testing/autorun" require "puma" -require "mocha/setup" +require "mocha/minitest" require "rack/mock" begin diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index 6ea02ac191..66f11fe5bd 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -184,4 +184,4 @@ module InTimeZone end end -require "mocha/setup" # FIXME: stop using mocha +require "mocha/minitest" # FIXME: stop using mocha -- cgit v1.2.3 From 1cc282db7dea1b6eba2132775a17d980e40eee23 Mon Sep 17 00:00:00 2001 From: James Mead <james@floehopper.org> Date: Sat, 7 Apr 2018 12:26:27 +0100 Subject: Upgrade Mocha from v1.3.0 to v1.5.0 Mocha v1.5.0 is currently the latest release. --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f43f52418d..dba0848cd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -308,7 +308,7 @@ GEM path_expander (~> 1.0) minitest-server (1.0.5) minitest (~> 5.0) - mocha (1.3.0) + mocha (1.5.0) metaclass (~> 0.0.1) mono_logger (1.1.0) msgpack (1.2.4) -- cgit v1.2.3