Skip to content

Commit 334582f

Browse files
committed
Updated dependency on "minitest" and fixed code incompatible code
Note: Still does not run on Ruby 2.2: elasticsearch-model/test/test_helper.rb:32:in `<top (required)>': cannot load such file -- test/unit (LoadError)
1 parent fb8bfd9 commit 334582f

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

elasticsearch-model/elasticsearch-model.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
4141
s.add_development_dependency "will_paginate"
4242
# NOTE: Do not add Mongoid here, keep only in 3/4 files
4343

44-
s.add_development_dependency "minitest", "~> 4.0"
44+
s.add_development_dependency "minitest", "~> 4"
4545
s.add_development_dependency "shoulda-context"
4646
s.add_development_dependency "mocha"
4747
s.add_development_dependency "turn"

elasticsearch-model/test/test_helper.rb

+8-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010

1111
puts '-'*80
1212

13-
require 'test/unit'
13+
require 'minitest/autorun'
14+
begin; require 'test/unit'; rescue LoadError; end
1415
require 'shoulda-context'
1516
require 'mocha/setup'
1617
require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
@@ -28,6 +29,12 @@
2829
require 'elasticsearch/extensions/test/cluster'
2930
require 'elasticsearch/extensions/test/startup_shutdown'
3031

32+
module Test
33+
module Unit
34+
class TestCase < MiniTest::Unit::TestCase; end
35+
end
36+
end unless defined?(::Test::Unit::TestCase)
37+
3138
module Elasticsearch
3239
module Test
3340
class IntegrationTestCase < ::Test::Unit::TestCase

elasticsearch-persistence/elasticsearch-persistence.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
3939

4040
s.add_development_dependency "elasticsearch-extensions"
4141

42-
s.add_development_dependency "minitest", "~> 4.0"
42+
s.add_development_dependency "minitest", "~> 4"
4343
s.add_development_dependency "shoulda-context"
4444
s.add_development_dependency "mocha"
4545
s.add_development_dependency "turn"

elasticsearch-rails/elasticsearch-rails.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
3434

3535
s.add_development_dependency "lograge"
3636

37-
s.add_development_dependency "minitest", "~> 4.0"
37+
s.add_development_dependency "minitest", "~> 4"
3838
s.add_development_dependency "shoulda-context"
3939
s.add_development_dependency "mocha"
4040
s.add_development_dependency "turn"

0 commit comments

Comments
 (0)