Merge pull request lynndylanhurley#891 from silviusimeria/master

Support for devise 4.3 that is now supporting rails 5.1

Author: booleanbetrayal

.gitignore

@@ -11,3 +11,4 @@ coverage
 .idea
 .irb_history
 .ruby-version
+.ruby-gemset

Gemfile.lock

@@ -34,7 +34,7 @@ PATH
   remote: .
   specs:
     devise_token_auth (0.1.41)
-      devise (> 3.5.2, <= 4.2.1)
+      devise (> 3.5.2, <= 4.3)
       rails (< 6)
 
 GEM
@@ -81,18 +81,18 @@ GEM
     attr_encrypted (3.0.1)
       encryptor (~> 3.0.0)
     bcrypt (3.1.11)
-    builder (3.2.2)
+    builder (3.2.3)
     codeclimate-test-reporter (0.6.0)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
     colorize (0.8.1)
     concurrent-ruby (1.0.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.2.0)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
     docile (1.1.5)
@@ -115,8 +115,8 @@ GEM
       colorize (~> 0.7)
       github_api (~> 0.12)
       rake (>= 10.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     guard (2.14.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -131,8 +131,8 @@ GEM
       guard-compat (~> 1.2)
       minitest (>= 3.0)
     hashie (3.4.4)
-    i18n (0.7.0)
-    json (1.8.3)
+    i18n (0.8.1)
+    json (1.8.6)
     jwt (1.5.4)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -141,15 +141,15 @@ GEM
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.10.2)
     minitest-focus (1.1.2)
       minitest (>= 4, < 6)
     minitest-rails (2.2.1)
@@ -167,9 +167,8 @@ GEM
     multipart-post (2.0.0)
     mysql2 (0.4.4)
     nenv (0.3.0)
-    nokogiri (1.6.8)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -187,15 +186,14 @@ GEM
       omniauth (~> 1.2)
     orm_adapter (0.5.0)
     pg (0.18.4)
-    pkg-config (1.1.7)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    rack (1.6.4)
+    rack (1.6.8)
     rack-cors (0.4.0)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -212,9 +210,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -223,12 +221,13 @@ GEM
       activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
+    rake (12.0.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     ruby-progressbar (1.8.1)
     ruby_dep (1.3.1)
     shellany (0.0.1)
@@ -238,19 +237,19 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
 
 PLATFORMS
@@ -283,4 +282,4 @@ DEPENDENCIES
   thor
 
 BUNDLED WITH
-   1.11.2
+   1.14.6

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.2.1"
+  s.add_dependency "devise", "> 3.5.2", "<= 4.3"
 
   s.add_development_dependency "sqlite3", "~> 1.3"
   s.add_development_dependency 'pg'

test/controllers/devise_token_auth/passwords_controller_test.rb

@@ -83,9 +83,9 @@ class DeviseTokenAuth::PasswordsControllerTest < ActionController::TestCase
             @data = JSON.parse(response.body)
           end
 
-            test 'response should not contain extra data' do
-              assert_equal @data['data'], nil
-            end
+          test 'response should not contain extra data' do
+            assert_nil @data["data"]
+          end
         end