From cc980b2e8a86f581755cac62a64adadaed97ae23 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Thu, 28 Jan 2021 16:21:19 +0100 Subject: [PATCH] fixed broken test for good and improved file api --- cookbook/tests/views/test_views_api.py | 10 +++++++++- cookbook/views/api.py | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/cookbook/tests/views/test_views_api.py b/cookbook/tests/views/test_views_api.py index 6530a2118..f36987d10 100644 --- a/cookbook/tests/views/test_views_api.py +++ b/cookbook/tests/views/test_views_api.py @@ -23,7 +23,15 @@ class TestViewsApi(TestViews): self.assertEqual(self.superuser_client.get(url).status_code, 200) def test_file_permission(self): - url = reverse('api_get_recipe_file', args=[1]) + recipe = Recipe.objects.create( + internal=False, + link='test', + working_time=1, + waiting_time=1, + created_by=auth.get_user(self.user_client_1) + ) + + url = reverse('api_get_recipe_file', args=[recipe.pk]) self.assertEqual(self.anonymous_client.get(url).status_code, 302) self.assertEqual(self.guest_client_1.get(url).status_code, 200) diff --git a/cookbook/views/api.py b/cookbook/views/api.py index fafbe1b36..21a39f18e 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -402,10 +402,10 @@ def get_external_file_link(request, recipe_id): @group_required('guest') def get_recipe_file(request, recipe_id): recipe = Recipe.objects.get(id=recipe_id) - # if not recipe.cors_link: - # update_recipe_links(recipe) - - return FileResponse(get_recipe_provider(recipe).get_file(recipe)) + if recipe.storage: + return FileResponse(get_recipe_provider(recipe).get_file(recipe)) + else: + return FileResponse() @group_required('user')