ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/posts: allow tagless posts

Browse source
This commit is contained in:
rr- 2016-08-21 23:36:11 +02:00
parent f0ed82b0de
commit b7e9cbd541
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/szurubooru/api/post_api.py
View file

@ -31,7 +31,7 @@ def create_post(ctx, _params=None):
else: else:
auth.verify_privilege(ctx.user, 'posts:create:identified') auth.verify_privilege(ctx.user, 'posts:create:identified')
content = ctx.get_file('content', required=True) content = ctx.get_file('content', required=True)
tag_names = ctx.get_param_as_list('tags', required=True) tag_names = ctx.get_param_as_list('tags', required=False, default=[])
safety = ctx.get_param_as_string('safety', required=True) safety = ctx.get_param_as_string('safety', required=True)
source = ctx.get_param_as_string('source', required=False, default=None) source = ctx.get_param_as_string('source', required=False, default=None)
if ctx.has_param('contentUrl') and not source: if ctx.has_param('contentUrl') and not source:

39
server/szurubooru/tests/api/test_post_creating.py
View file

@ -207,11 +207,10 @@ def test_creating_from_url_with_source_specified(
posts.update_post_source.assert_called_once_with(post, 'example2.com') posts.update_post_source.assert_called_once_with(post, 'example2.com')
@pytest.mark.parametrize('field', ['tags', 'safety']) @pytest.mark.parametrize('field', ['safety'])
def test_trying_to_omit_mandatory_field(context_factory, user_factory, field): def test_trying_to_omit_mandatory_field(context_factory, user_factory, field):
params = { params = {
'safety': 'safe', 'safety': 'safe',
'tags': ['tag1', 'tag2'],
} }
del params[field] del params[field]
with pytest.raises(errors.MissingRequiredParameterError): with pytest.raises(errors.MissingRequiredParameterError):
@ -222,6 +221,42 @@ def test_trying_to_omit_mandatory_field(context_factory, user_factory, field):
user=user_factory(rank=db.User.RANK_REGULAR))) user=user_factory(rank=db.User.RANK_REGULAR)))
@pytest.mark.parametrize(
'field', ['tags', 'relations', 'source', 'notes', 'flags'])
def test_omitting_optional_field(
field, context_factory, post_factory, user_factory):
auth_user = user_factory(rank=db.User.RANK_REGULAR)
post = post_factory()
db.session.add(post)
db.session.flush()
params = {
'safety': 'safe',
'tags': ['tag1', 'tag2'],
'relations': [1, 2],
'source': 'source',
'notes': ['note1', 'note2'],
'flags': ['flag1', 'flag2'],
}
del params[field]
with patch('szurubooru.func.posts.create_post'), \
patch('szurubooru.func.posts.update_post_safety'), \
patch('szurubooru.func.posts.update_post_source'), \
patch('szurubooru.func.posts.update_post_relations'), \
patch('szurubooru.func.posts.update_post_notes'), \
patch('szurubooru.func.posts.update_post_flags'), \
patch('szurubooru.func.posts.serialize_post'), \
patch('szurubooru.func.tags.export_to_json'), \
patch('szurubooru.func.snapshots.create'):
posts.create_post.return_value = (post, [])
posts.serialize_post.return_value = 'serialized post'
result = api.post_api.create_post(
context_factory(
params=params,
files={'content': 'post-content'},
user=auth_user))
assert result == 'serialized post'
def test_trying_to_omit_content(context_factory, user_factory): def test_trying_to_omit_content(context_factory, user_factory):
with pytest.raises(errors.MissingRequiredFileError): with pytest.raises(errors.MissingRequiredFileError):
api.post_api.create_post( api.post_api.create_post(