Skip to content

Consider config.relative_url_root in ActsAsResourceController.base_url #1282

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.

Sign up for GitHub

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

Merged
lgebhardt merged 3 commits into from
Sep 16, 2019
Merged

Consider config.relative_url_root in ActsAsResourceController.base_url #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1fdcb3
Consider relative URL root configuration
tobias-bischoff Sep 4, 2019
4cc1e5e
Add test for relative root in links
tobias-bischoff Sep 4, 2019
37fa80d
Clean up after test
tobias-bischoff Sep 4, 2019
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
2 changes: 1 addition & 1 deletion lib/jsonapi/acts_as_resource_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def resource_serializer_klass
end

def base_url
@base_url ||= request.protocol + request.host_with_port
@base_url ||= "#{request.protocol}#{request.host_with_port}#{Rails.application.config.relative_url_root}"
end

def resource_klass_name
Expand Down
7 changes: 7 additions & 0 deletions test/controllers/controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ def setup
JSONAPI.configuration.always_include_to_one_linkage_data = false
end

def test_links_include_relative_root
Rails.application.config.relative_url_root = '/subdir'
assert_cacheable_get :index
assert json_response['data'][0]['links']['self'].include?('/subdir')
Rails.application.config.relative_url_root = nil
end

def test_index
assert_cacheable_get :index
assert_response :success
Expand Down