Merge pull request #1139 from hirepool/fix_broken_test_and_ci_builds

Fix broken stubbed method expectation

test/controllers/devise_token_auth/omniauth_callbacks_controller_test.rb

@@ -1,5 +1,5 @@
 require 'test_helper'
-require 'mocha/test_unit'
+require 'mocha/minitest'
 
 #  was the web request successful?
 #  was the user redirected to the right page?
@@ -70,7 +70,10 @@ def get_parsed_data_json
     end
 
     test 'sign_in was called' do
-      User.any_instance.expects(:sign_in)
+      DeviseTokenAuth::OmniauthCallbacksController.any_instance\
+        .expects(:sign_in).with(
+          :user, instance_of(User), has_entries(store: false, bypass: false)
+        )
       get_success
     end