From 3ede62cf6e7ac9bbfc70b04571ac75c6d8775c25 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Mon, 19 Sep 2016 21:58:50 +0200
Subject: [PATCH] Migration to latest devise

---
 Gemfile                                         | 2 +-
 Gemfile.lock                                    | 9 ++++-----
 test/controllers/events_controller_test.rb      | 2 +-
 test/controllers/maps_controller_test.rb        | 3 ++-
 test/controllers/moderations_controller_test.rb | 2 +-
 test/controllers/notes_controller_test.rb       | 2 +-
 test/controllers/orgas_controller_test.rb       | 2 +-
 test/controllers/users_controller_test.rb       | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index b9b29383..ebb8371d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'jbuilder'
 gem 'haml-rails'
 
 # Latest versions break active admin!
-gem 'devise', '< 4.0'
+gem 'devise'
 gem 'devise-i18n'
 gem 'rails-i18n'
 # Store some specific content, like application name and static pages contents
diff --git a/Gemfile.lock b/Gemfile.lock
index a2c3f060..6acf27f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,12 +102,11 @@ GEM
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
     debug_inspector (0.0.2)
-    devise (3.5.10)
+    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)
     devise-i18n (1.1.0)
     differ (0.1.2)
@@ -252,7 +251,7 @@ GEM
     paper_trail (5.2.2)
       activerecord (>= 3.0, < 6.0)
       request_store (~> 1.1)
-    parser (2.3.1.3)
+    parser (2.3.1.4)
       ast (~> 2.2)
     pkg-config (1.1.7)
     polyamorous (1.3.1)
@@ -411,7 +410,7 @@ DEPENDENCIES
   brakeman
   byebug
   coffee-rails
-  devise (< 4.0)
+  devise
   devise-i18n
   differ
   email_validator
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
index 20a8a03b..a57e968f 100644
--- a/test/controllers/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 # Event life cycle
 class EventsControllerTest < ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
     @event = events :one
diff --git a/test/controllers/maps_controller_test.rb b/test/controllers/maps_controller_test.rb
index 53293739..4b2c9083 100644
--- a/test/controllers/maps_controller_test.rb
+++ b/test/controllers/maps_controller_test.rb
@@ -2,7 +2,8 @@ require 'test_helper'
 
 # Test the geocoding life cycle
 class MapsControllerTest < ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
+
   test 'should get index' do
     get :index
     assert_response :success
diff --git a/test/controllers/moderations_controller_test.rb b/test/controllers/moderations_controller_test.rb
index 63f26e02..17a335a9 100644
--- a/test/controllers/moderations_controller_test.rb
+++ b/test/controllers/moderations_controller_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 # Event management, moderation means refusal, acceptation or demands for more
 # information
 class ModerationsControllerTest < ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
     @moderation = events :one
diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 82ad020b..914f02b9 100644
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 # Test the notes life cycle
 class NotesControllerTest < ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
     @note = notes(:one)
diff --git a/test/controllers/orgas_controller_test.rb b/test/controllers/orgas_controller_test.rb
index d30c319e..9c73abf6 100644
--- a/test/controllers/orgas_controller_test.rb
+++ b/test/controllers/orgas_controller_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 # Free Software groups life cycle
 class OrgasControllerTest < ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
     @orga = orgas :one
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index a8f0060c..83e47aa2 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 
 # Test moderator management controller
 class UsersControllerTest < ActionController::TestCase
-  include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
     @user = users(:one)