agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Migration to latest devise

Browse Source
This commit is contained in:
echarp 2016-09-19 21:58:50 +02:00
parent f82369a9f8
commit 3ede62cf6e
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -24,7 +24,7 @@ gem 'jbuilder'
gem 'haml-rails' gem 'haml-rails'
# Latest versions break active admin! # Latest versions break active admin!
gem 'devise', '< 4.0' gem 'devise'
gem 'devise-i18n' gem 'devise-i18n'
gem 'rails-i18n' gem 'rails-i18n'
# Store some specific content, like application name and static pages contents # Store some specific content, like application name and static pages contents

9
Gemfile.lock
View File

@ -102,12 +102,11 @@ GEM
coffee-script-source (1.10.0) coffee-script-source (1.10.0)
concurrent-ruby (1.0.2) concurrent-ruby (1.0.2)
debug_inspector (0.0.2) debug_inspector (0.0.2)
devise (3.5.10) devise (4.2.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5) railties (>= 4.1.0, < 5.1)
responders responders
thread_safe (~> 0.1)
warden (~> 1.2.3) warden (~> 1.2.3)
devise-i18n (1.1.0) devise-i18n (1.1.0)
differ (0.1.2) differ (0.1.2)
@ -252,7 +251,7 @@ GEM
paper_trail (5.2.2) paper_trail (5.2.2)
activerecord (>= 3.0, < 6.0) activerecord (>= 3.0, < 6.0)
request_store (~> 1.1) request_store (~> 1.1)
parser (2.3.1.3) parser (2.3.1.4)
ast (~> 2.2) ast (~> 2.2)
pkg-config (1.1.7) pkg-config (1.1.7)
polyamorous (1.3.1) polyamorous (1.3.1)
@ -411,7 +410,7 @@ DEPENDENCIES
brakeman brakeman
byebug byebug
coffee-rails coffee-rails
devise (< 4.0) devise
devise-i18n devise-i18n
differ differ
email_validator email_validator

2
test/controllers/events_controller_test.rb
View File

@ -2,7 +2,7 @@ require 'test_helper'
# Event life cycle # Event life cycle
class EventsControllerTest < ActionController::TestCase class EventsControllerTest < ActionController::TestCase
include Devise::TestHelpers include Devise::Test::ControllerHelpers
setup do setup do
@event = events :one @event = events :one

3
test/controllers/maps_controller_test.rb
View File

@ -2,7 +2,8 @@ require 'test_helper'
# Test the geocoding life cycle # Test the geocoding life cycle
class MapsControllerTest < ActionController::TestCase class MapsControllerTest < ActionController::TestCase
include Devise::TestHelpers include Devise::Test::ControllerHelpers
test 'should get index' do test 'should get index' do
get :index get :index
assert_response :success assert_response :success

2
test/controllers/moderations_controller_test.rb
View File

@ -3,7 +3,7 @@ require 'test_helper'
# Event management, moderation means refusal, acceptation or demands for more # Event management, moderation means refusal, acceptation or demands for more
# information # information
class ModerationsControllerTest < ActionController::TestCase class ModerationsControllerTest < ActionController::TestCase
include Devise::TestHelpers include Devise::Test::ControllerHelpers
setup do setup do
@moderation = events :one @moderation = events :one

2
test/controllers/notes_controller_test.rb
View File

@ -2,7 +2,7 @@ require 'test_helper'
# Test the notes life cycle # Test the notes life cycle
class NotesControllerTest < ActionController::TestCase class NotesControllerTest < ActionController::TestCase
include Devise::TestHelpers include Devise::Test::ControllerHelpers
setup do setup do
@note = notes(:one) @note = notes(:one)

2
test/controllers/orgas_controller_test.rb
View File

@ -2,7 +2,7 @@ require 'test_helper'
# Free Software groups life cycle # Free Software groups life cycle
class OrgasControllerTest < ActionController::TestCase class OrgasControllerTest < ActionController::TestCase
include Devise::TestHelpers include Devise::Test::ControllerHelpers
setup do setup do
@orga = orgas :one @orga = orgas :one

2
test/controllers/users_controller_test.rb
View File

@ -2,7 +2,7 @@ require 'test_helper'
# Test moderator management controller # Test moderator management controller
class UsersControllerTest < ActionController::TestCase class UsersControllerTest < ActionController::TestCase
include Devise::TestHelpers include Devise::Test::ControllerHelpers
setup do setup do
@user = users(:one) @user = users(:one)