Rename ExampleHelpers.config - appeared to be conflicting in Rails 4+

This commit is contained in:
richie 2016-10-14 09:55:55 -07:00
parent 63e0e53104
commit 312f68ae72
2 changed files with 8 additions and 6 deletions

View File

@ -6,7 +6,8 @@ module Rswag
module ExampleHelpers
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
send(
@ -28,13 +29,14 @@ module Rswag
end
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)
end
private
def config
def rswag_config
::Rswag::Specs.config
end
end

View File

@ -10,9 +10,9 @@ module Rswag
subject.extend ExampleHelpers
# Mock out some infrastructure
stub_const('Rails::VERSION::MAJOR', 3)
config = double('config')
allow(config).to receive(:get_swagger_doc).and_return(global_metadata)
allow(subject).to receive(:config).and_return(config)
rswag_config = double('rswag_config')
allow(rswag_config).to receive(:get_swagger_doc).and_return(global_metadata)
allow(subject).to receive(:rswag_config).and_return(rswag_config)
end
let(:api_metadata) do
{