diff options
author | KodApa85 <parsons151185@gmail.com> | 2018-04-13 20:30:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-13 20:30:43 +0100 |
commit | dbbe6af563072b62e373a9824c6a23482d20896e (patch) | |
tree | ab5341e8b1cd37aa0abf54662714f272cd8f9633 /spec/spec_helper.rb | |
parent | 97aa0535a0c8c237c1ccb7a1683d5f6faa1f0339 (diff) | |
parent | 56ec279b2e9e2735ed88405fd177e77f9e376801 (diff) |
Merge branch 'master' into xgs4600-cli
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 28eb9d4..2b49a6c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,5 @@ require 'minitest/autorun' -require 'mocha/mini_test' +require 'mocha/minitest' require 'oxidized' Oxidized.mgr = Oxidized::Manager.new |