aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c60241d447..96207e022f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,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", "~> 0.14", require: false
+gem "mocha", require: false
gem "capybara", "~> 2.15"
diff --git a/Gemfile.lock b/Gemfile.lock
index fb18fdc14e..938b4a71cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
path_expander (~> 1.0)
minitest-server (1.0.4)
minitest (~> 5.0)
- mocha (0.14.0)
+ mocha (1.3.0)
metaclass (~> 0.0.1)
mono_logger (1.1.0)
msgpack (1.1.0)
@@ -506,7 +506,7 @@ DEPENDENCIES
listen (>= 3.0.5, < 3.2)
mini_magick
minitest-bisect
- mocha (~> 0.14)
+ mocha
mysql2 (>= 0.4.4)
nokogiri (>= 1.6.8)
pg (>= 0.18.0)