diff --git a/cookbook/tests/views/test_views_api.py b/cookbook/tests/views/test_views_api.py index 39089d027..b3ae6bec7 100644 --- a/cookbook/tests/views/test_views_api.py +++ b/cookbook/tests/views/test_views_api.py @@ -1,8 +1,7 @@ -from django.contrib import auth -from django.urls import reverse - from cookbook.models import Recipe from cookbook.tests.views.test_views import TestViews +from django.contrib import auth +from django.urls import reverse class TestViewsApi(TestViews): diff --git a/cookbook/tests/views/test_views_general.py b/cookbook/tests/views/test_views_general.py index e99307fa3..69675ff91 100644 --- a/cookbook/tests/views/test_views_general.py +++ b/cookbook/tests/views/test_views_general.py @@ -1,6 +1,5 @@ -from django.urls import reverse - from cookbook.tests.views.test_views import TestViews +from django.urls import reverse class TestViewsGeneral(TestViews): @@ -19,11 +18,29 @@ class TestViewsGeneral(TestViews): def test_books(self): url = reverse('view_books') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 302), (self.user_client_1, 200), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 302), + (self.user_client_1, 200), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) def test_plan(self): url = reverse('view_plan') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 302), (self.user_client_1, 200), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 302), + (self.user_client_1, 200), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) def test_plan_entry(self): # TODO add appropriate test @@ -31,28 +48,91 @@ class TestViewsGeneral(TestViews): def test_shopping(self): url = reverse('view_shopping') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 302), (self.user_client_1, 200), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 302), + (self.user_client_1, 200), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) def test_settings(self): url = reverse('view_settings') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 200), (self.user_client_1, 200), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 200), + (self.user_client_1, 200), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) def test_history(self): url = reverse('view_history') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 200), (self.user_client_1, 200), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 200), + (self.user_client_1, 200), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) def test_system(self): url = reverse('view_system') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 302), (self.user_client_1, 302), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 302), + (self.user_client_1, 302), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) def test_setup(self): url = reverse('view_setup') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 302), (self.user_client_1, 302), (self.admin_client_1, 302), (self.superuser_client, 302)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 302), + (self.user_client_1, 302), + (self.admin_client_1, 302), + (self.superuser_client, 302) + ], + url + ) def test_markdown_info(self): url = reverse('docs_markdown') - self.batch_requests([(self.anonymous_client, 200), (self.guest_client_1, 200), (self.user_client_1, 200), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 200), + (self.guest_client_1, 200), + (self.user_client_1, 200), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) def test_api_info(self): url = reverse('docs_api') - self.batch_requests([(self.anonymous_client, 302), (self.guest_client_1, 200), (self.user_client_1, 200), (self.admin_client_1, 200), (self.superuser_client, 200)], url) + self.batch_requests( + [ + (self.anonymous_client, 302), + (self.guest_client_1, 200), + (self.user_client_1, 200), + (self.admin_client_1, 200), + (self.superuser_client, 200) + ], + url + ) diff --git a/cookbook/tests/views/test_views_recipe_share.py b/cookbook/tests/views/test_views_recipe_share.py index 2c0575698..38b342dd5 100644 --- a/cookbook/tests/views/test_views_recipe_share.py +++ b/cookbook/tests/views/test_views_recipe_share.py @@ -1,11 +1,10 @@ import uuid -from django.contrib import auth -from django.urls import reverse - from cookbook.helper.permission_helper import share_link_valid from cookbook.models import Recipe, ShareLink from cookbook.tests.views.test_views import TestViews +from django.contrib import auth +from django.urls import reverse class TestViewsGeneral(TestViews): @@ -31,14 +30,23 @@ class TestViewsGeneral(TestViews): self.assertIsNotNone(share) self.assertTrue(share_link_valid(internal_recipe, share.uuid)) - url = reverse('view_recipe', kwargs={'pk': internal_recipe.pk, 'share': share.uuid}) + url = reverse( + 'view_recipe', + kwargs={'pk': internal_recipe.pk, 'share': share.uuid} + ) r = self.anonymous_client.get(url) self.assertEqual(r.status_code, 200) - url = reverse('view_recipe', kwargs={'pk': (internal_recipe.pk + 1), 'share': share.uuid}) + url = reverse( + 'view_recipe', + kwargs={'pk': (internal_recipe.pk + 1), 'share': share.uuid} + ) r = self.anonymous_client.get(url) self.assertEqual(r.status_code, 404) - url = reverse('view_recipe', kwargs={'pk': internal_recipe.pk, 'share': uuid.uuid4()}) + url = reverse( + 'view_recipe', + kwargs={'pk': internal_recipe.pk, 'share': uuid.uuid4()} + ) r = self.anonymous_client.get(url) self.assertEqual(r.status_code, 302)