Skip to content

Commit d73319d

Browse files
committed
Extend factories create_filegroup to also create files in a group
And test request view with a filegroup; this should be the default now - every file has to be in at least the default grop.
1 parent 74031fd commit d73319d

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

tests/factories.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ def write_request_file(request, path, contents=""):
4747
path.write_text(contents)
4848

4949

50-
def create_filegroup(release_request, group_name):
50+
def create_filegroup(release_request, group_name, filepaths=None):
51+
for filepath in filepaths or []:
52+
api.add_file_to_request(
53+
release_request, filepath, User(1, release_request.author), group_name
54+
)
5155
return api._get_or_create_filegroupmetadata(release_request.id, group_name)
5256

5357

tests/integration/test_views.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,29 @@ def test_request_view_with_directory(client_with_permission, ui_options):
307307

308308
def test_request_view_with_file(client_with_permission, ui_options):
309309
release_request = factories.create_release_request("workspace")
310-
factories.write_request_file(release_request, "file.txt", "foobar")
310+
factories.write_workspace_file("workspace", "file.txt", "foobar")
311+
factories.create_filegroup(
312+
release_request,
313+
group_name="default_group",
314+
filepaths=["file.txt"]
315+
)
316+
311317
response = client_with_permission.get(
312318
f"/requests/view/{release_request.id}/file.txt"
313319
)
320+
assert "default_group" in response.rendered_content
314321
assert "foobar" in response.rendered_content
315322

316323

324+
def test_request_view_with_submitted_request(client_with_permission, ui_options):
325+
release_request = factories.create_release_request("workspace", status=Status.SUBMITTED)
326+
response = client_with_permission.get(
327+
f"/requests/view/{release_request.id}", follow=True
328+
)
329+
assert "Reject Request" in response.rendered_content
330+
assert "Release Files" in response.rendered_content
331+
332+
317333
def test_request_view_with_404(client_with_permission):
318334
release_request = factories.create_release_request("workspace")
319335
response = client_with_permission.get(

0 commit comments

Comments
 (0)