diff options
| author | Akira Matsuda <ronnie@dio.jp> | 2017-01-16 00:16:41 +0900 |
|---|---|---|
| committer | Akira Matsuda <ronnie@dio.jp> | 2017-01-16 00:16:41 +0900 |
| commit | 46fdbc5290335ed38fa9fe2b6b0ef8abe4eccb1b (patch) | |
| tree | db6b8adacb9552cf7b67467d4a266af5f4562d23 | |
| parent | 66e5b9d3f47cd52143be0e6a216ade34bb52b9cc (diff) | |
| download | rails-46fdbc5290335ed38fa9fe2b6b0ef8abe4eccb1b.tar.gz rails-46fdbc5290335ed38fa9fe2b6b0ef8abe4eccb1b.tar.bz2 rails-46fdbc5290335ed38fa9fe2b6b0ef8abe4eccb1b.zip | |
Revert "bundle u mocha"
This reverts commit 66e5b9d3f47cd52143be0e6a216ade34bb52b9cc.
We're seeing some test failures in AR postgresql tests
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,7 @@ 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", "~> 0.14", require: false gem "rack-cache", "~> 1.2" gem "jquery-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 4fa856b198..94d538b84b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -229,7 +229,7 @@ GEM mime-types-data (3.2016.0521) mini_portile2 (2.1.0) minitest (5.3.3) - mocha (1.2.1) + mocha (0.14.0) metaclass (~> 0.0.1) mono_logger (1.1.0) multi_json (1.12.1) @@ -399,7 +399,7 @@ DEPENDENCIES libxml-ruby listen (>= 3.0.5, < 3.2) minitest (< 5.3.4) - mocha + mocha (~> 0.14) mysql2 (>= 0.4.4) nokogiri (>= 1.6.8) pg (>= 0.18.0) |