diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2018-04-07 22:30:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 22:30:48 -0500 |
| commit | 8a2f4a212ac5b68cc37050f56a50cae689259920 (patch) | |
| tree | fed0f0eae57b55f0f8ffc655b933a20cb7321f03 | |
| parent | a7491b73f830be093fd35740c377d65235078321 (diff) | |
| parent | 1cc282db7dea1b6eba2132775a17d980e40eee23 (diff) | |
| download | rails-8a2f4a212ac5b68cc37050f56a50cae689259920.tar.gz rails-8a2f4a212ac5b68cc37050f56a50cae689259920.tar.bz2 rails-8a2f4a212ac5b68cc37050f56a50cae689259920.zip | |
Merge pull request #32486 from floehopper/mocha-updates
Mocha updates
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | actioncable/test/test_helper.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 2 |
4 files changed, 4 insertions, 6 deletions
@@ -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" 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) 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 |