Merge branch 'feature/request_spec_generator'

This commit is contained in:
Greg Myers 2019-10-16 21:12:51 +01:00
commit 5ee880b769
4 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@ module Rspec
end
def create_spec_file
template 'spec.rb', File.join('spec/requests', "#{controller_path}_spec.rb")
template 'spec.rb', File.join('spec', 'requests', "#{controller_path}_spec.rb")
end
private

View File

@ -3,7 +3,7 @@ require 'json-schema'
module Rswag
module Specs
class ExtendedSchema < JSON::Schema::Draft4
def initialize
super
@attributes['type'] = ExtendedTypeAttribute
@ -13,7 +13,7 @@ module Rswag
end
class ExtendedTypeAttribute < JSON::Schema::TypeV4Attribute
def self.validate(current_schema, data, fragments, processor, validator, options={})
return if data.nil? && current_schema.schema['x-nullable'] == true
super

View File

@ -5,7 +5,7 @@ module Rswag
rake_tasks do
load File.expand_path('../../../tasks/rswag-specs_tasks.rake', __FILE__)
end
generators do
require 'generators/rspec/swagger/swagger_generator.rb'
end

View File

@ -54,7 +54,7 @@ module Rswag
definitions[key]
end
def add_verb(request, metadata)
def add_verb(request, metadata)
request[:verb] = metadata[:operation][:verb]
end
@ -104,7 +104,7 @@ module Rswag
end
# Content-Type header
consumes = metadata[:operation][:consumes] || swagger_doc[:consumes]
consumes = metadata[:operation][:consumes] || swagger_doc[:consumes]
if consumes
content_type = example.respond_to?(:'Content-Type') ? example.send(:'Content-Type') : consumes.first
tuples << [ 'Content-Type', content_type ]