Show More
@@ -21,9 +21,10 b' import mock' | |||||
21 | import pytest |
|
21 | import pytest | |
22 |
|
22 | |||
23 | import rhodecode |
|
23 | import rhodecode | |
|
24 | from rhodecode.lib import helpers as h | |||
24 | from rhodecode.lib.vcs.backends.base import MergeResponse, MergeFailureReason |
|
25 | from rhodecode.lib.vcs.backends.base import MergeResponse, MergeFailureReason | |
25 | from rhodecode.lib.vcs.nodes import FileNode |
|
26 | from rhodecode.lib.vcs.nodes import FileNode | |
26 |
from rhodecode.lib import |
|
27 | from rhodecode.lib.ext_json import json | |
27 | from rhodecode.model.changeset_status import ChangesetStatusModel |
|
28 | from rhodecode.model.changeset_status import ChangesetStatusModel | |
28 | from rhodecode.model.db import ( |
|
29 | from rhodecode.model.db import ( | |
29 | PullRequest, ChangesetStatus, UserLog, Notification, ChangesetComment, Repository) |
|
30 | PullRequest, ChangesetStatus, UserLog, Notification, ChangesetComment, Repository) | |
@@ -1431,7 +1432,7 b' class TestPullrequestsView(object):' | |||||
1431 | 'csrf_token': csrf_token}) |
|
1432 | 'csrf_token': csrf_token}) | |
1432 |
|
1433 | |||
1433 | assert response.status_int == 200 |
|
1434 | assert response.status_int == 200 | |
1434 | assert response.body == '{"response": true, "redirect_url": null}' |
|
1435 | assert json.loads(response.body) == json.loads('{"response": true, "redirect_url": null}') | |
1435 |
|
1436 | |||
1436 | # Make sure that after update, it won't raise 500 errors |
|
1437 | # Make sure that after update, it won't raise 500 errors | |
1437 | response = self.app.get(route_path( |
|
1438 | response = self.app.get(route_path( |
General Comments 0
You need to be logged in to leave comments.
Login now