engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

db: use more consistent sorting using real objects, strings are deprecated in laters sqlalchemy query syntax.

Browse source
This commit is contained in:
Marcin Kuzminski 2019-09-30 13:24:56 +02:00
parent c3a0748ecb
commit a17adaa9f2
7 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/api/tests/test_close_pull_request.py
View file

@ -49,7 +49,7 @@ class TestClosePullRequest(object):
assert_ok(id_, expected, response.body)
journal = UserLog.query()\
.filter(UserLog.user_id == author) \
.order_by('user_log_id') \
.order_by(UserLog.user_log_id.asc()) \
.filter(UserLog.repository_id == repo)\
.all()
assert journal[-1].action == 'repo.pull_request.close'

2
rhodecode/api/tests/test_comment_pull_request.py
View file

@ -65,7 +65,7 @@ class TestCommentPullRequest(object):
journal = UserLog.query()\
.filter(UserLog.user_id == author)\
.filter(UserLog.repository_id == repo) \
.order_by('user_log_id') \
.order_by(UserLog.user_log_id.asc()) \
.all()
assert journal[-1].action == 'repo.pull_request.comment.create'

4
rhodecode/api/tests/test_merge_pull_request.py
View file

@ -120,7 +120,7 @@ class TestMergePullRequest(object):
journal = UserLog.query()\
.filter(UserLog.user_id == author)\
.filter(UserLog.repository_id == repo) \
.order_by('user_log_id') \
.order_by(UserLog.user_log_id.asc()) \
.all()
assert journal[-2].action == 'repo.pull_request.merge'
assert journal[-1].action == 'repo.pull_request.close'
@ -221,7 +221,7 @@ class TestMergePullRequest(object):
journal = UserLog.query() \
.filter(UserLog.user_id == merge_user_id) \
.filter(UserLog.repository_id == repo) \
.order_by('user_log_id') \
.order_by(UserLog.user_log_id.asc()) \
.all()
assert journal[-2].action == 'repo.pull_request.merge'
assert journal[-1].action == 'repo.pull_request.close'