mirror of
https://github.com/ditkrg/rswag.git
synced 2026-01-24 23:06:41 +00:00
Rename ExampleHelpers.config - appeared to be conflicting in Rails 4+
This commit is contained in:
parent
63e0e53104
commit
312f68ae72
@ -6,7 +6,8 @@ module Rswag
|
|||||||
module ExampleHelpers
|
module ExampleHelpers
|
||||||
|
|
||||||
def submit_request(api_metadata)
|
def submit_request(api_metadata)
|
||||||
factory = RequestFactory.new(api_metadata, config.get_swagger_doc(api_metadata[:swagger_doc]))
|
global_metadata = rswag_config.get_swagger_doc(api_metadata[:swagger_doc])
|
||||||
|
factory = RequestFactory.new(api_metadata, global_metadata)
|
||||||
|
|
||||||
if RAILS_VERSION < 5
|
if RAILS_VERSION < 5
|
||||||
send(
|
send(
|
||||||
@ -28,13 +29,14 @@ module Rswag
|
|||||||
end
|
end
|
||||||
|
|
||||||
def assert_response_matches_metadata(api_metadata)
|
def assert_response_matches_metadata(api_metadata)
|
||||||
validator = ResponseValidator.new(api_metadata, config.get_swagger_doc(api_metadata[:swagger_doc]))
|
global_metadata = rswag_config.get_swagger_doc(api_metadata[:swagger_doc])
|
||||||
|
validator = ResponseValidator.new(api_metadata, global_metadata)
|
||||||
validator.validate!(response)
|
validator.validate!(response)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def config
|
def rswag_config
|
||||||
::Rswag::Specs.config
|
::Rswag::Specs.config
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -10,9 +10,9 @@ module Rswag
|
|||||||
subject.extend ExampleHelpers
|
subject.extend ExampleHelpers
|
||||||
# Mock out some infrastructure
|
# Mock out some infrastructure
|
||||||
stub_const('Rails::VERSION::MAJOR', 3)
|
stub_const('Rails::VERSION::MAJOR', 3)
|
||||||
config = double('config')
|
rswag_config = double('rswag_config')
|
||||||
allow(config).to receive(:get_swagger_doc).and_return(global_metadata)
|
allow(rswag_config).to receive(:get_swagger_doc).and_return(global_metadata)
|
||||||
allow(subject).to receive(:config).and_return(config)
|
allow(subject).to receive(:rswag_config).and_return(rswag_config)
|
||||||
end
|
end
|
||||||
let(:api_metadata) do
|
let(:api_metadata) do
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user