Skip to content

Allow to render request for parameters without 'format' #147

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.

Sign up for GitHub

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

Merged
mission-liao merged 1 commit into from
Dec 23, 2017
Merged

Allow to render request for parameters without 'format' #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions pyswagger/primitives/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,14 @@ def __init__(self):
# init map of generators
self._map = {
'integer': {
'': _int_,
None: _int_,
'int32': _int_,
'int64': _int_,
},
'number': {
'': _float_,
None: _float_,
'float': _float_,
'double': _float_,
},
Expand Down
6 changes: 6 additions & 0 deletions pyswagger/tests/data/v2_0/render/other/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,19 @@
}
]
},
"float.2":{
"type":"number"
},
"integer.1":{
"type":"integer",
"format":"int32",
"maximum":50,
"minimum":10,
"multipleOf":5
},
"integer.2":{
"type":"integer"
},
"enum.string":{
"type":"string",
"enum":[
Expand Down
16 changes: 16 additions & 0 deletions pyswagger/tests/test_render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@ def test_integer(self):
self.assertTrue(i >= 10, 'should be greater than 10, not {0}'.format(i))
self.assertTrue((i % 5) == 0, 'should be moduleable by 5, not {0}'.format(i))

def test_integer_without_format(self):
for _ in six.moves.xrange(50):
i = self.rnd.render(
self.app.resolve('#/definitions/integer.2'),
opt=self.rnd.default()
)
self.assertTrue(isinstance(i, six.integer_types), 'should be integer, not {0}'.format(i))

def test_float(self):
for _ in six.moves.xrange(50):
f = self.rnd.render(
Expand All @@ -134,6 +142,14 @@ def test_float(self):
self.assertTrue(f >= 50, 'should be greater than 50, not {0}'.format(f))
self.assertTrue((f % 5) == 0, 'should be moduleable by 5, not {0}'.format(f))

def test_float_without_format(self):
for _ in six.moves.xrange(50):
f = self.rnd.render(
self.app.resolve('#/definitions/float.2'),
opt=self.rnd.default()
)
self.assertTrue(isinstance(f, float), 'should be float, not {0}'.format(f))

def test_bool(self):
b = self.rnd.render(
self.app.resolve('#/definitions/bool.1'),
Expand Down