From 21f601d60c06a6ed33b51725164861a4a9f2a078 Mon Sep 17 00:00:00 2001
From: Brent Dearth <brent.dearth@gmail.com>
Date: Mon, 11 Jul 2016 14:17:28 -0600
Subject: [PATCH] chore(deps): update dependencies + silence deprecation
 warnings in specs

---
 Gemfile.lock                     | 27 ++++++++++++++-------------
 devise_token_auth.gemspec        |  2 +-
 test/dummy/config/application.rb |  2 ++
 test/test_helper.rb              |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 804d58785..570c595b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,7 +35,7 @@ PATH
   remote: .
   specs:
     devise_token_auth (0.1.37)
-      devise (> 3.5.2, < 4.1)
+      devise (> 3.5.2, <= 4.2)
       rails (< 6)
 
 GEM
@@ -81,21 +81,20 @@ GEM
     arel (6.0.3)
     attr_encrypted (1.3.5)
       encryptor (~> 1.3.0)
-    bcrypt (3.1.10)
+    bcrypt (3.1.11)
     builder (3.2.2)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     colorize (0.7.7)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.5.5)
+    devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     docile (1.1.5)
     encryptor (1.3.0)
@@ -142,11 +141,13 @@ GEM
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
-    mime-types (2.99)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.0.0)
     minitest (5.8.4)
     minitest-focus (1.1.2)
@@ -224,7 +225,7 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    responders (2.1.1)
+    responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     ruby-progressbar (1.7.5)
     shellany (0.0.1)
@@ -234,10 +235,10 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.5.2)
+    sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.0)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -246,7 +247,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    warden (1.2.4)
+    warden (1.2.6)
       rack (>= 1.0)
 
 PLATFORMS
diff --git a/devise_token_auth.gemspec b/devise_token_auth.gemspec
index e16d95640..a77c00c76 100644
--- a/devise_token_auth.gemspec
+++ b/devise_token_auth.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files.reject! { |file| file.match(/[.log|.sqlite3]$/) }
 
   s.add_dependency "rails", "< 6"
-  s.add_dependency "devise", "> 3.5.2", "<= 4.1.1"
+  s.add_dependency "devise", "> 3.5.2", "<= 4.2"
 
   s.add_development_dependency "sqlite3", "~> 1.3"
   s.add_development_dependency 'pg'
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
index ff7cd58d8..f265029f6 100644
--- a/test/dummy/config/application.rb
+++ b/test/dummy/config/application.rb
@@ -20,5 +20,7 @@ class Application < Rails::Application
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
     config.autoload_paths << Rails.root.join('lib')
+
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3b9f88871..a37e30d30 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -55,7 +55,7 @@ def expire_token(user, client_id)
 end
 
 class ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
     @routes = Dummy::Application.routes