Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use cookies only when available #684

Merged
merged 4 commits into from
May 26, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update session/persistence test
  • Loading branch information
epaew committed Sep 28, 2019
commit 7345d239a9ea39534c4dae7fd773892eee35e50b
12 changes: 11 additions & 1 deletion lib/authlogic/test_case/mock_api_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def params
end

def request
@request ||= MockRequest.new(controller)
@request ||= MockRequest.new(self)
end

def request_content_type
Expand All @@ -37,6 +37,16 @@ def request_content_type
def session
@session ||= {}
end

# If method is defined, it causes below behavior...
# controller = Authlogic::ControllerAdapters::RailsAdapter.new(
# Authlogic::TestCase::MockAPIController.new
# )
# controller.responds_to_single_access_allowed? #=> true
# controller.single_access_allowed?
# #=> NoMethodError: undefined method `single_access_allowed?' for nil:NilClass
#
undef :single_access_allowed?
end
end
end
2 changes: 1 addition & 1 deletion lib/authlogic/test_case/mock_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def params
end

def request
@request ||= MockRequest.new(controller)
@request ||= MockRequest.new(self)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change. The tests pass without it. Can you please explain?

end

def request_content_type
Expand Down
4 changes: 4 additions & 0 deletions lib/authlogic/test_case/mock_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ def initialize(controller)
self.controller = controller
end

def format
controller.request_content_type if controller.respond_to? :request_content_type
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The conditional seems unnecessary. I can remove the if controller.respond_to? and the tests still pass. I guess because both of our "test controllers" respond to request_content_type?

end

def ip
controller&.respond_to?(:env) &&
controller.env.is_a?(Hash) &&
Expand Down
15 changes: 15 additions & 0 deletions test/session_test/persistence_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# frozen_string_literal: true

require "test_helper"
require "authlogic/controller_adapters/rails_adapter"

module SessionTest
class PersistenceTest < ActiveSupport::TestCase
Expand All @@ -17,6 +18,20 @@ def test_find
assert session
end

def test_find_in_api
@controller = Authlogic::TestCase::MockAPIController.new
UserSession.controller =
Authlogic::ControllerAdapters::RailsAdapter.new(@controller)

aaron = users(:aaron)
refute UserSession.find

UserSession.single_access_allowed_request_types = ["application/json"]
set_params_for(aaron)
set_request_content_type("application/json")
assert UserSession.find
end

def test_persisting
# tested thoroughly in test_find
end
Expand Down