Upgrade Devise from 4.1.1 to 4.2.0.
This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers. Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
This commit is contained in:
parent
3b206ccb83
commit
8062380f60
12 changed files with 14 additions and 14 deletions
2
Gemfile
2
Gemfile
|
@ -17,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql
|
|||
gem 'pg', '~> 0.18.2', group: :postgres
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.0'
|
||||
gem 'devise', '~> 4.2'
|
||||
gem 'doorkeeper', '~> 4.2.0'
|
||||
gem 'omniauth', '~> 1.3.1'
|
||||
gem 'omniauth-auth0', '~> 1.4.1'
|
||||
|
|
|
@ -161,7 +161,7 @@ GEM
|
|||
activerecord (>= 3.2.0, < 5.1)
|
||||
descendants_tracker (0.0.4)
|
||||
thread_safe (~> 0.3, >= 0.3.1)
|
||||
devise (4.1.1)
|
||||
devise (4.2.0)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0, < 5.1)
|
||||
|
@ -587,7 +587,7 @@ GEM
|
|||
request_store (1.3.1)
|
||||
rerun (0.11.0)
|
||||
listen (~> 3.0)
|
||||
responders (2.1.1)
|
||||
responders (2.3.0)
|
||||
railties (>= 4.2.0, < 5.1)
|
||||
rinku (2.0.0)
|
||||
rotp (2.1.2)
|
||||
|
@ -835,7 +835,7 @@ DEPENDENCIES
|
|||
d3_rails (~> 3.5.0)
|
||||
database_cleaner (~> 1.5.0)
|
||||
default_value_for (~> 3.0.0)
|
||||
devise (~> 4.0)
|
||||
devise (~> 4.2)
|
||||
devise-two-factor (~> 3.0.0)
|
||||
diffy (~> 3.0.3)
|
||||
doorkeeper (~> 4.2.0)
|
||||
|
|
|
@ -26,7 +26,7 @@ RSpec.configure do |config|
|
|||
config.verbose_retry = true
|
||||
config.display_try_failure_messages = true
|
||||
|
||||
config.include Devise::TestHelpers, type: :controller
|
||||
config.include Devise::Test::ControllerHelpers, type: :controller
|
||||
config.include Warden::Test::Helpers, type: :request
|
||||
config.include LoginHelpers, type: :feature
|
||||
config.include StubConfiguration
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'admin/dashboard/index.html.haml' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
before do
|
||||
assign(:projects, create_list(:empty_project, 1))
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/builds/show' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:project) { create(:project) }
|
||||
let(:pipeline) do
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/issues/_related_branches' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:project) { create(:project) }
|
||||
let(:branch) { project.repository.find_branch('feature') }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/merge_requests/widget/_heading' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
context 'when released to an environment' do
|
||||
let(:project) { merge_request.target_project }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/merge_requests/edit.html.haml' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project) }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/merge_requests/show.html.haml' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project) }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/notes/_form' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:empty_project) }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/pipelines/show' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:project) { create(:project) }
|
||||
let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.id) }
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe 'projects/tree/show' do
|
||||
include Devise::TestHelpers
|
||||
include Devise::Test::ControllerHelpers
|
||||
|
||||
let(:project) { create(:project) }
|
||||
let(:repository) { project.repository }
|
||||
|
|
Loading…
Reference in a new issue