Separate Devise test methods from Devise

This commit is contained in:
Dan Schultzer
2017-04-29 10:24:22 -07:00
parent 0591d92f53
commit be2e17841e
10 changed files with 26 additions and 20 deletions

View File

@@ -3,5 +3,5 @@ require 'shared_user'
class User < ActiveRecord::Base
include Shim
include SharedUser
include ActiveModel::Serializers::Xml if Devise.rails5?
include ActiveModel::Serializers::Xml if Devise::Test.rails5?
end

View File

@@ -20,7 +20,7 @@ class HomeController < ApplicationController
end
def unauthenticated
if Devise.rails5?
if Devise::Test.rails5?
render body: "unauthenticated", status: :unauthorized
else
render text: "unauthenticated", status: :unauthorized

View File

@@ -9,6 +9,6 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
user = User.to_adapter.find_first(email: 'user@test.com')
user.remember_me = true
sign_in user
render (Devise.rails5? ? :body : :text) => ""
render (Devise::Test.rails5? ? :body : :text) => ""
end
end

View File

@@ -13,7 +13,7 @@ class UsersController < ApplicationController
end
def update_form
render (Devise.rails5? ? :body : :text) => 'Update'
render (Devise::Test.rails5? ? :body : :text) => 'Update'
end
def accept
@@ -21,11 +21,11 @@ class UsersController < ApplicationController
end
def exhibit
render (Devise.rails5? ? :body : :text) => current_user ? "User is authenticated" : "User is not authenticated"
render (Devise::Test.rails5? ? :body : :text) => current_user ? "User is authenticated" : "User is not authenticated"
end
def expire
user_session['last_request_at'] = 31.minutes.ago.utc
render (Devise.rails5? ? :body : :text) => 'User will be expired on next request'
render (Devise::Test.rails5? ? :body : :text) => 'User will be expired on next request'
end
end