Migration to latest devise

filter
echarp 6 years ago
parent f82369a9f8
commit 3ede62cf6e
  1. 2
      Gemfile
  2. 9
      Gemfile.lock
  3. 2
      test/controllers/events_controller_test.rb
  4. 3
      test/controllers/maps_controller_test.rb
  5. 2
      test/controllers/moderations_controller_test.rb
  6. 2
      test/controllers/notes_controller_test.rb
  7. 2
      test/controllers/orgas_controller_test.rb
  8. 2
      test/controllers/users_controller_test.rb

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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)

@ -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

@ -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)

Loading…
Cancel
Save