Skip to content
Open
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/swagger/docs/generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ def get_klass_models(klass)
klass.swagger_models.each do |model_name, model|
formatted_model = {
id: model[:id],
required: model[:required],
properties: model[:properties],
}
formatted_model[:required] = model[:required] if model[:required]
formatted_model[:description] = model[:description] if model[:description]
models[model[:id]] = formatted_model
end
Expand Down
5 changes: 5 additions & 0 deletions spec/fixtures/controllers/sample_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ class SampleController < SuperclassController
property :name, :string, :optional, "Name", foo: "test"
property_list :type, :string, :optional, "Type", ["info", "warning", "error"]
end

swagger_model :OptionalTag do
description "A Tag object with no required property."
property :name, :string, :optional, "Name", foo: "test"
end
end
end
end
5 changes: 5 additions & 0 deletions spec/lib/swagger/docs/generator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,12 @@
}
expect(models['Tag']).to eq expected_model
end

it "should not have required field when no property is required" do
expect(models['OptionalTag'].has_key?('required')).to eq false
end
end

context "custom resource_path resource file" do
let(:resource) { file_resource_custom_resource_path.read }
let(:response) { JSON.parse(resource) }
Expand Down