diff --git a/cookbook/tests/api/docs/reports/tests/assets/style.css b/cookbook/tests/api/docs/reports/tests/assets/style.css new file mode 100644 index 000000000..561524c69 --- /dev/null +++ b/cookbook/tests/api/docs/reports/tests/assets/style.css @@ -0,0 +1,319 @@ +body { + font-family: Helvetica, Arial, sans-serif; + font-size: 12px; + /* do not increase min-width as some may use split screens */ + min-width: 800px; + color: #999; +} + +h1 { + font-size: 24px; + color: black; +} + +h2 { + font-size: 16px; + color: black; +} + +p { + color: black; +} + +a { + color: #999; +} + +table { + border-collapse: collapse; +} + +/****************************** + * SUMMARY INFORMATION + ******************************/ +#environment td { + padding: 5px; + border: 1px solid #e6e6e6; + vertical-align: top; +} +#environment tr:nth-child(odd) { + background-color: #f6f6f6; +} +#environment ul { + margin: 0; + padding: 0 20px; +} + +/****************************** + * TEST RESULT COLORS + ******************************/ +span.passed, +.passed .col-result { + color: green; +} + +span.skipped, +span.xfailed, +span.rerun, +.skipped .col-result, +.xfailed .col-result, +.rerun .col-result { + color: orange; +} + +span.error, +span.failed, +span.xpassed, +.error .col-result, +.failed .col-result, +.xpassed .col-result { + color: red; +} + +.col-links__extra { + margin-right: 3px; +} + +/****************************** + * RESULTS TABLE + * + * 1. Table Layout + * 2. Extra + * 3. Sorting items + * + ******************************/ +/*------------------ + * 1. Table Layout + *------------------*/ +#results-table { + border: 1px solid #e6e6e6; + color: #999; + font-size: 12px; + width: 100%; +} +#results-table th, +#results-table td { + padding: 5px; + border: 1px solid #e6e6e6; + text-align: left; +} +#results-table th { + font-weight: bold; +} + +/*------------------ + * 2. Extra + *------------------*/ +.logwrapper { + max-height: 230px; + overflow-y: scroll; + background-color: #e6e6e6; +} +.logwrapper.expanded { + max-height: none; +} +.logwrapper.expanded .logexpander:after { + content: "collapse [-]"; +} +.logwrapper .logexpander { + z-index: 1; + position: sticky; + top: 10px; + width: max-content; + border: 1px solid; + border-radius: 3px; + padding: 5px 7px; + margin: 10px 0 10px calc(100% - 80px); + cursor: pointer; + background-color: #e6e6e6; +} +.logwrapper .logexpander:after { + content: "expand [+]"; +} +.logwrapper .logexpander:hover { + color: #000; + border-color: #000; +} +.logwrapper .log { + min-height: 40px; + position: relative; + top: -50px; + height: calc(100% + 50px); + border: 1px solid #e6e6e6; + color: black; + display: block; + font-family: "Courier New", Courier, monospace; + padding: 5px; + padding-right: 80px; + white-space: pre-wrap; +} + +div.media { + border: 1px solid #e6e6e6; + float: right; + height: 240px; + margin: 0 5px; + overflow: hidden; + width: 320px; +} + +.media-container { + display: grid; + grid-template-columns: 25px auto 25px; + align-items: center; + flex: 1 1; + overflow: hidden; + height: 200px; +} + +.media-container--fullscreen { + grid-template-columns: 0px auto 0px; +} + +.media-container__nav--right, +.media-container__nav--left { + text-align: center; + cursor: pointer; +} + +.media-container__viewport { + cursor: pointer; + text-align: center; + height: inherit; +} +.media-container__viewport img, +.media-container__viewport video { + object-fit: cover; + width: 100%; + max-height: 100%; +} + +.media__name, +.media__counter { + display: flex; + flex-direction: row; + justify-content: space-around; + flex: 0 0 25px; + align-items: center; +} + +.collapsible td:not(.col-links) { + cursor: pointer; +} +.collapsible td:not(.col-links):hover::after { + color: #bbb; + font-style: italic; + cursor: pointer; +} + +.col-result { + width: 130px; +} +.col-result:hover::after { + content: " (hide details)"; +} + +.col-result.collapsed:hover::after { + content: " (show details)"; +} + +#environment-header h2:hover::after { + content: " (hide details)"; + color: #bbb; + font-style: italic; + cursor: pointer; + font-size: 12px; +} + +#environment-header.collapsed h2:hover::after { + content: " (show details)"; + color: #bbb; + font-style: italic; + cursor: pointer; + font-size: 12px; +} + +/*------------------ + * 3. Sorting items + *------------------*/ +.sortable { + cursor: pointer; +} +.sortable.desc:after { + content: " "; + position: relative; + left: 5px; + bottom: -12.5px; + border: 10px solid #4caf50; + border-bottom: 0; + border-left-color: transparent; + border-right-color: transparent; +} +.sortable.asc:after { + content: " "; + position: relative; + left: 5px; + bottom: 12.5px; + border: 10px solid #4caf50; + border-top: 0; + border-left-color: transparent; + border-right-color: transparent; +} + +.hidden, .summary__reload__button.hidden { + display: none; +} + +.summary__data { + flex: 0 0 550px; +} +.summary__reload { + flex: 1 1; + display: flex; + justify-content: center; +} +.summary__reload__button { + flex: 0 0 300px; + display: flex; + color: white; + font-weight: bold; + background-color: #4caf50; + text-align: center; + justify-content: center; + align-items: center; + border-radius: 3px; + cursor: pointer; +} +.summary__reload__button:hover { + background-color: #46a049; +} +.summary__spacer { + flex: 0 0 550px; +} + +.controls { + display: flex; + justify-content: space-between; +} + +.filters, +.collapse { + display: flex; + align-items: center; +} +.filters button, +.collapse button { + color: #999; + border: none; + background: none; + cursor: pointer; + text-decoration: underline; +} +.filters button:hover, +.collapse button:hover { + color: #ccc; +} + +.filter__label { + margin-right: 10px; +} diff --git a/cookbook/tests/api/docs/reports/tests/pytest.xml b/cookbook/tests/api/docs/reports/tests/pytest.xml new file mode 100644 index 000000000..46143d8da --- /dev/null +++ b/cookbook/tests/api/docs/reports/tests/pytest.xml @@ -0,0 +1,19 @@ +arg = ['g1_s1', 403] +request = <FixtureRequest for <Function test_list_permission[arg1]>> + + @pytest.mark.parametrize("arg", [ + ['a_u', 403], + ['g1_s1', 403], + ['u1_s1', 200], + ['a1_s1', 200], + ]) + def test_list_permission(arg, request): + c = request.getfixturevalue(arg[0]) +> assert c.get(reverse(LIST_URL)).status_code == arg[1] +E assert 200 == 403 +E + where 200 = <Response status_code=200, "application/json">.status_code +E + where <Response status_code=200, "application/json"> = <bound method Client.get of <django.test.client.Client object at 0x0000017B4EB67350>>('/api/food/') +E + where <bound method Client.get of <django.test.client.Client object at 0x0000017B4EB67350>> = <django.test.client.Client object at 0x0000017B4EB67350>.get +E + and '/api/food/' = reverse('api:food-list') + +test_api_food.py:90: AssertionError \ No newline at end of file diff --git a/cookbook/tests/api/docs/reports/tests/tests.html b/cookbook/tests/api/docs/reports/tests/tests.html new file mode 100644 index 000000000..e9fb6cf54 --- /dev/null +++ b/cookbook/tests/api/docs/reports/tests/tests.html @@ -0,0 +1,770 @@ + + + + + tests.html + + + +

tests.html

+

Report generated on 18-Aug-2024 at 12:56:14 by pytest-html + v4.1.1

+
+

Environment

+
+
+ + + + + +
+
+

Summary

+
+
+

4 tests took 00:01:48.

+

(Un)check the boxes to filter the results.

+
+ +
+
+
+
+ + 1 Failed, + + 3 Passed, + + 0 Skipped, + + 0 Expected failures, + + 0 Unexpected passes, + + 0 Errors, + + 0 Reruns +
+
+  /  +
+
+
+
+
+
+
+
+ + + + + + + + + +
ResultTestDurationLinks
+ + + \ No newline at end of file diff --git a/cookbook/tests/api/test_api_food.py b/cookbook/tests/api/test_api_food.py index ae6ec111b..ccf46e386 100644 --- a/cookbook/tests/api/test_api_food.py +++ b/cookbook/tests/api/test_api_food.py @@ -81,7 +81,7 @@ def obj_tree_1(request, space_1): @pytest.mark.parametrize("arg", [ ['a_u', 403], - ['g1_s1', 403], + ['g1_s1', 200], ['u1_s1', 200], ['a1_s1', 200], ]) diff --git a/cookbook/tests/api/test_api_keyword.py b/cookbook/tests/api/test_api_keyword.py index dc4855725..39164d041 100644 --- a/cookbook/tests/api/test_api_keyword.py +++ b/cookbook/tests/api/test_api_keyword.py @@ -73,7 +73,7 @@ def recipe_1_1_s1(u1_s1, obj_1_1, space_1): @pytest.mark.parametrize("arg", [ ['a_u', 403], - ['g1_s1', 403], + ['g1_s1', 200], ['u1_s1', 200], ['a1_s1', 200], ]) diff --git a/cookbook/tests/api/test_api_space.py b/cookbook/tests/api/test_api_space.py index bedbec653..a86e5f17c 100644 --- a/cookbook/tests/api/test_api_space.py +++ b/cookbook/tests/api/test_api_space.py @@ -11,7 +11,7 @@ DETAIL_URL = 'api:space-detail' @pytest.mark.parametrize("arg", [ ['a_u', 403, 0], - ['g1_s1', 403, 0], + ['g1_s1', 200, 0], ['u1_s1', 200, 1], ['a1_s1', 200, 1], ['a2_s1', 200, 1], diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 4ed6a07a1..a95716a66 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -59,7 +59,7 @@ from cookbook.helper.ingredient_parser import IngredientParser from cookbook.helper.open_data_importer import OpenDataImporter from cookbook.helper.permission_helper import ( CustomIsAdmin, CustomIsOwner, CustomIsOwnerReadOnly, CustomIsShared, CustomIsSpaceOwner, CustomIsUser, CustomRecipePermission, CustomTokenHasReadWriteScope, - CustomTokenHasScope, CustomUserPermission, IsReadOnlyDRF, above_space_limit, group_required, has_group_permission, is_space_owner, switch_user_active_space, + CustomTokenHasScope, CustomUserPermission, IsReadOnlyDRF, above_space_limit, group_required, has_group_permission, is_space_owner, switch_user_active_space, CustomIsGuest, ) from cookbook.helper.recipe_search import RecipeSearch from cookbook.helper.recipe_url_import import clean_dict, get_from_youtube_scraper, get_images_from_soup @@ -405,7 +405,7 @@ class GroupViewSet(viewsets.ModelViewSet): class SpaceViewSet(viewsets.ModelViewSet): queryset = Space.objects serializer_class = SpaceSerializer - permission_classes = [IsReadOnlyDRF & CustomIsUser | CustomIsOwner & CustomIsAdmin & CustomTokenHasReadWriteScope] + permission_classes = [IsReadOnlyDRF & CustomIsGuest | CustomIsOwner & CustomIsAdmin & CustomTokenHasReadWriteScope] http_method_names = ['get', 'patch'] def get_queryset(self): @@ -521,7 +521,7 @@ class KeywordViewSet(viewsets.ModelViewSet, TreeMixin): queryset = Keyword.objects model = Keyword serializer_class = KeywordSerializer - permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope] + permission_classes = [(CustomIsGuest & IsReadOnlyDRF | CustomIsUser) & CustomTokenHasReadWriteScope] pagination_class = DefaultPagination @@ -548,7 +548,7 @@ class FoodViewSet(viewsets.ModelViewSet, TreeMixin): queryset = Food.objects model = Food serializer_class = FoodSerializer - permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope] + permission_classes = [(CustomIsGuest & IsReadOnlyDRF | CustomIsUser) & CustomTokenHasReadWriteScope] pagination_class = DefaultPagination def get_queryset(self):