Make tests run on Ruby 2.2.x

1. Added selective require of test-unit gem vs. minitest
2. Added closing `true` statement to Mocha `expects(:foo).with {...}` expressions, because `assert_equal` doesn't return a truthy value
3. Don't require "turn" on Ruby 2.2
4. Don't run integration tests against ActiveModel/Record 3.0 on Ruby 2.2
5. Don't run the Rails instrumentation test on Ruby 2.2 (should be investigated)

Author: karmi

elasticsearch-model/Rakefile

@@ -30,7 +30,7 @@ namespace :test do
 
   desc "Run integration tests against ActiveModel 3 and 4"
   task :integration do
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
+    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle exec rake test:run_integration" unless defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
     sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
   end
 

elasticsearch-model/elasticsearch-model.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "will_paginate"
 
   s.add_development_dependency "minitest", "~> 4"
+  s.add_development_dependency "test-unit" if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"

elasticsearch-model/test/test_helper.rb

@@ -10,11 +10,17 @@
 
 puts '-'*80
 
-require 'minitest/autorun'
-begin; require 'test/unit'; rescue LoadError; end
+if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
+  require 'test-unit'
+  require 'mocha/test_unit'
+else
+  require 'minitest/autorun'
+  require 'mocha/mini_test'
+end
+
 require 'shoulda-context'
-require 'mocha/setup'
-require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
+
+require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
 require 'oj'
@@ -28,12 +34,6 @@
 require 'elasticsearch/extensions/test/cluster'
 require 'elasticsearch/extensions/test/startup_shutdown'
 
-module Test
-  module Unit
-    class TestCase < MiniTest::Unit::TestCase; end
-  end
-end unless defined?(::Test::Unit::TestCase)
-
 module Elasticsearch
   module Test
     class IntegrationTestCase < ::Test::Unit::TestCase

elasticsearch-model/test/unit/callbacks_test.rb

@@ -22,6 +22,7 @@ def callbacks_mixin
       ::DummyCallbacksModel.expects(:__send__).with do |method, parameter|
         assert_equal :include, method
         assert_equal DummyCallbacksAdapter::CallbacksMixin, parameter
+        true
       end
 
       Elasticsearch::Model::Callbacks.included(DummyCallbacksModel)

elasticsearch-model/test/unit/importing_test.rb

@@ -108,10 +108,12 @@ def importing_mixin
       DummyImportingModel.expects(:__find_in_batches).with do |options|
         assert_equal 'bar', options[:foo]
         assert_nil   options[:force]
+        true
       end
 
       DummyImportingModel.expects(:create_index!).with do |options|
         assert_equal true, options[:force]
+        true
       end
 
       DummyImportingModel.expects(:index_name).returns('foo')

elasticsearch-model/test/unit/indexing_test.rb

@@ -164,6 +164,7 @@ def as_indexed_json(options={})
         instance.expects(:instance_variable_set).with do |name, value|
           assert_equal :@__changed_attributes, name
           assert_equal({foo: 'Two'}, value)
+          true
         end
 
         ::DummyIndexingModelWithCallbacks.__send__ :include, Elasticsearch::Model::Indexing::InstanceMethods
@@ -182,6 +183,7 @@ def as_indexed_json(options={})
           assert_equal 'bar',  payload[:type]
           assert_equal '1',    payload[:id]
           assert_equal 'JSON', payload[:body]
+          true
         end
 
         instance.expects(:client).returns(client)
@@ -199,6 +201,7 @@ def as_indexed_json(options={})
 
         client.expects(:index).with do |payload|
           assert_equal 'A',  payload[:parent]
+          true
         end
 
         instance.expects(:client).returns(client)
@@ -218,6 +221,7 @@ def as_indexed_json(options={})
           assert_equal 'foo',  payload[:index]
           assert_equal 'bar',  payload[:type]
           assert_equal '1',    payload[:id]
+          true
         end
 
         instance.expects(:client).returns(client)
@@ -234,6 +238,7 @@ def as_indexed_json(options={})
 
         client.expects(:delete).with do |payload|
           assert_equal 'A',  payload[:parent]
+          true
         end
 
         instance.expects(:client).returns(client)
@@ -267,6 +272,7 @@ def as_indexed_json(options={})
           assert_equal 'bar',  payload[:type]
           assert_equal '1',    payload[:id]
           assert_equal({foo: 'bar'}, payload[:body][:doc])
+          true
         end
 
         instance.expects(:client).returns(client)
@@ -286,6 +292,7 @@ def as_indexed_json(options={})
 
         client.expects(:update).with do |payload|
           assert_equal({:foo => 'B'}, payload[:body][:doc])
+          true
         end
 
         instance.expects(:client).returns(client)
@@ -306,6 +313,7 @@ def as_indexed_json(options={})
 
         client.expects(:update).with do |payload|
           assert_equal({'foo' => 'BAR'}, payload[:body][:doc])
+          true
         end
 
         instance.expects(:client).returns(client)
@@ -356,6 +364,7 @@ class ::DummyIndexingModelForRecreate
           assert_equal 'dummy_indexing_model_for_recreates', payload[:index]
           assert_equal 1,         payload[:body][:settings][:index][:number_of_shards]
           assert_equal 'keyword', payload[:body][:mappings][:dummy_indexing_model_for_recreate][:properties][:foo][:analyzer]
+          true
         end.returns({})
 
         DummyIndexingModelForRecreate.expects(:client).returns(client).at_least_once
@@ -434,10 +443,12 @@ class ::DummyIndexingModelForRecreate
         should "create the custom index" do
           @indices.expects(:exists).with do |arguments|
             assert_equal 'custom-foo', arguments[:index]
+            true
           end
 
           @indices.expects(:create).with do |arguments|
             assert_equal 'custom-foo', arguments[:index]
+            true
           end
 
           DummyIndexingModelForRecreate.create_index! index: 'custom-foo'
@@ -446,6 +457,7 @@ class ::DummyIndexingModelForRecreate
         should "delete the custom index" do
           @indices.expects(:delete).with do |arguments|
             assert_equal 'custom-foo', arguments[:index]
+            true
           end
 
           DummyIndexingModelForRecreate.delete_index! index: 'custom-foo'
@@ -454,6 +466,7 @@ class ::DummyIndexingModelForRecreate
         should "refresh the custom index" do
           @indices.expects(:refresh).with do |arguments|
             assert_equal 'custom-foo', arguments[:index]
+            true
           end
 
           DummyIndexingModelForRecreate.refresh_index! index: 'custom-foo'

elasticsearch-model/test/unit/proxy_test.rb

@@ -48,6 +48,7 @@ def changes
       instance.__elasticsearch__.expects(:instance_variable_set).with do |name, value|
         assert_equal :@__changed_attributes, name
         assert_equal({foo: 'Two'}, value)
+        true
       end
 
       ::DummyProxyModelWithCallbacks.__send__ :include, Elasticsearch::Model::Proxy

elasticsearch-model/test/unit/response_pagination_kaminari_test.rb

@@ -34,6 +34,7 @@ def self.document_type; 'bar'; end
             .with do |definition|
               assert_equal 25, definition[:from]
               assert_equal 25, definition[:size]
+              true
             end
           .returns(RESPONSE)
 
@@ -51,6 +52,7 @@ def self.document_type; 'bar'; end
             .with do |definition|
               assert_equal 75, definition[:from]
               assert_equal 25, definition[:size]
+              true
             end
           .returns(RESPONSE)
 

elasticsearch-model/test/unit/response_pagination_will_paginate_test.rb

@@ -88,6 +88,7 @@ class WillPaginateResponse < Elasticsearch::Model::Response::Response
             .with do |definition|
               assert_equal 0, definition[:from]
               assert_equal 33, definition[:size]
+              true
             end
           .returns(RESPONSE)
 
@@ -105,6 +106,7 @@ class WillPaginateResponse < Elasticsearch::Model::Response::Response
             .with do |definition|
               assert_equal 33, definition[:from]
               assert_equal 33, definition[:size]
+              true
             end
           .returns(RESPONSE)
 
@@ -122,6 +124,7 @@ class WillPaginateResponse < Elasticsearch::Model::Response::Response
             .with do |definition|
               assert_equal 18, definition[:from]
               assert_equal 9, definition[:size]
+              true
             end
           .returns(RESPONSE)
 
@@ -133,12 +136,13 @@ class WillPaginateResponse < Elasticsearch::Model::Response::Response
         assert_equal 9, @response.search.definition[:size]
       end
 
-      should "searches for page 1 if specified page is < 1" do
+      should "search for first page if specified page is < 1" do
         @response.klass.client
           .expects(:search)
             .with do |definition|
               assert_equal 0, definition[:from]
               assert_equal 33, definition[:size]
+              true
             end
           .returns(RESPONSE)
 

elasticsearch-model/test/unit/searching_search_request_test.rb

@@ -18,6 +18,7 @@ def self.document_type; 'bar'; end
     should "pass the search definition as a simple query" do
       @client.expects(:search).with do |params|
         assert_equal 'foo', params[:q]
+        true
       end
       .returns({})
 
@@ -28,6 +29,7 @@ def self.document_type; 'bar'; end
     should "pass the search definition as a Hash" do
       @client.expects(:search).with do |params|
         assert_equal( {foo: 'bar'}, params[:body] )
+        true
       end
       .returns({})
 
@@ -38,6 +40,7 @@ def self.document_type; 'bar'; end
     should "pass the search definition as a JSON string" do
       @client.expects(:search).with do |params|
         assert_equal( '{"foo":"bar"}', params[:body] )
+        true
       end
       .returns({})
 
@@ -52,6 +55,7 @@ def to_hash; {foo: 'bar'}; end
 
       @client.expects(:search).with do |params|
         assert_equal( {foo: 'bar'}, params[:body] )
+        true
       end
       .returns({})
 
@@ -63,6 +67,7 @@ def to_hash; {foo: 'bar'}; end
       @client.expects(:search).with do |params|
         assert_equal 'foo', params[:q]
         assert_equal 15,    params[:size]
+        true
       end
       .returns({})
 

elasticsearch-model/test/unit/searching_test.rb

@@ -24,6 +24,7 @@ def self.document_type; 'bar'; end
           assert_equal DummySearchingModel, klass
           assert_equal 'foo', query
           assert_equal({default_operator: 'AND'}, options)
+          true
         end
         .returns( stub('search') )
 

elasticsearch-persistence/elasticsearch-persistence.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "elasticsearch-extensions"
 
   s.add_development_dependency "minitest", "~> 4"
+  s.add_development_dependency "test-unit" if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"

elasticsearch-persistence/test/test_helper.rb

@@ -8,10 +8,17 @@
 # MUST be called before requiring `test/unit`.
 at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks } if ENV['SERVER']
 
-require 'test/unit'
+if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
+  require 'test-unit'
+  require 'mocha/test_unit'
+else
+  require 'minitest/autorun'
+  require 'mocha/mini_test'
+end
+
 require 'shoulda-context'
-require 'mocha/setup'
-require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
+
+require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
 require 'oj'

elasticsearch-persistence/test/unit/model_find_test.rb

@@ -93,6 +93,7 @@ class DummyFindModel
             assert_equal 'scan', arguments[:search_type]
             assert_equal 'foo',  arguments[:index]
             assert_equal 'bar',  arguments[:type]
+            true
           end
           .returns(MultiJson.load('{"_scroll_id":"abc123==", "hits":{"hits":[]}}'))