Correct Deprecation Errors in CI

app/mailers/spree/user_mailer.rb

@@ -1,14 +1,14 @@
 module Spree
   class UserMailer < BaseMailer
     def reset_password_instructions(user, token, *args)
-      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: Spree::Store.current.url)
-      @store = Spree::Store.current
+      @store = Spree::Store.default
+      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @store.url)
       mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])}"
     end
 
     def confirmation_instructions(user, token, opts={})
-      @confirmation_url = spree.spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
-      @store = Spree::Store.current
+      @store = Spree::Store.default
+      @confirmation_url = spree.spree_user_confirmation_url(confirmation_token: token, host: @store.url)
       mail to: user.email, from: from_address(@store), subject: "#{@store.name} #{I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions])}"
     end
   end

spec/support/authentication_helpers.rb

@@ -9,6 +9,6 @@ def sign_in_as!(user)
 
 RSpec.configure do |config|
   config.include AuthenticationHelpers, type: :feature
-  config.include Devise::TestHelpers,   type: :controller
-  config.include Rack::Test::Methods,   type: :feature
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Rack::Test::Methods, type: :feature
 end