Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-06-21 15:13:04 +02:00
commit a8e8eac0b4
7 files changed
+15 -30

No files matched your search

@@ -217,6 +217,15 @@ def test_write_file(http_controller, tmpdir, project):
assert response.status == 403
def test_write_and_get_file_with_leading_slashes_in_filename(http_controller, tmpdir, loop, project):
response = http_controller.post("/projects/{project_id}/files//hello".format(project_id=project.id), body="world", raw=True)
assert response.status == 200
response = http_controller.get("/projects/{project_id}/files//hello".format(project_id=project.id), raw=True)
assert response.status == 200
assert response.body == b"world"
def test_import(http_controller, tmpdir, controller):
with zipfile.ZipFile(str(tmpdir / "test.zip"), 'w') as myzip: