diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2016-09-21 17:06:33 -0600 |
---|---|---|
committer | Connor Shea <connor.james.shea@gmail.com> | 2016-09-27 20:08:49 -0600 |
commit | 8062380f60df576478677e9819ff602303166e4d (patch) | |
tree | bbaee819aab3df54769b0a8814813df515b5eda4 /spec/spec_helper.rb | |
parent | 3b206ccb8393d8f2c5ad227874d9a60beb054782 (diff) | |
download | gitlab-ce-8062380f60df576478677e9819ff602303166e4d.tar.gz |
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
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 02b2b3ca101..b19f5824236 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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 |