Skip to content

fix: Use mount_path to narrow down urls_for #1

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion lib/grape-swagger/rake/oapi_tasks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def make_request(url)
def urls_for(api_class)
api_class.routes
.map(&:path)
.select { |e| e.include?('doc') }
.grep(/#{GrapeSwagger::DocMethods.class_variable_get(:@@mount_path)}\(\.json\)$/)
.reject { |e| e.include?(':name') }
.map { |e| format_path(e) }
.map { |e| [e, ENV.fetch('resource', nil)].join('/').chomp('/') }
Expand Down
16 changes: 15 additions & 1 deletion spec/lib/oapi_tasks_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ class Item < Grape::API
namespace :otherItem do
get '/'
end

namespace :my_doc do
get '/'
end
end

class Base < Grape::API
Expand Down Expand Up @@ -115,7 +119,7 @@ class Base < Grape::API
end

it 'returns complete doc' do
expect(response['paths'].length).to eql 2
expect(response['paths'].length).to eql 3
end
end
end
Expand All @@ -132,6 +136,16 @@ class Base < Grape::API
end
end


describe '#urls_for' do
require 'pry'
describe 'match only the path to mount_path' do
it do
expect(subject.send(:urls_for, api_class)).to match_array ['/api/swagger_doc']
end
end
end

describe '#file' do
describe 'no store given' do
it 'returns swagger_doc.json' do
Expand Down