diff --git a/cookbook/filters.py b/cookbook/filters.py index b679a79f..a8f5976d 100644 --- a/cookbook/filters.py +++ b/cookbook/filters.py @@ -61,7 +61,6 @@ with scopes_disabled(): model = Recipe fields = ['name', 'keywords', 'foods', 'internal'] - class FoodFilter(django_filters.FilterSet): name = django_filters.CharFilter(lookup_expr='icontains') @@ -69,7 +68,6 @@ with scopes_disabled(): model = Food fields = ['name'] - class ShoppingListFilter(django_filters.FilterSet): def __init__(self, data=None, *args, **kwargs): diff --git a/cookbook/migrations/0118_auto_20210329_0605.py b/cookbook/migrations/0120_bookmarklet.py similarity index 96% rename from cookbook/migrations/0118_auto_20210329_0605.py rename to cookbook/migrations/0120_bookmarklet.py index a34dd673..903978ac 100644 --- a/cookbook/migrations/0118_auto_20210329_0605.py +++ b/cookbook/migrations/0120_bookmarklet.py @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('cookbook', '0117_space_max_recipes'), + ('cookbook', '0119_auto_20210411_2101'), ] operations = [ diff --git a/cookbook/tests/api/test_api_recipe.py b/cookbook/tests/api/test_api_recipe.py index 7506d8ef..243ea161 100644 --- a/cookbook/tests/api/test_api_recipe.py +++ b/cookbook/tests/api/test_api_recipe.py @@ -76,7 +76,7 @@ def test_add(arg, request, u1_s2): print(r.content) assert r.status_code == arg[1] if r.status_code == 201: - # id can change when running multiple tests, changed to validate name + # changed to name - when multiple tests run DB isn't cleared between tests assert response['name'] == 'test' r = c.get(reverse(DETAIL_URL, args={response['id']})) assert r.status_code == 200 diff --git a/cookbook/tests/other/test_url_import.py b/cookbook/tests/other/test_url_import.py index 76d3d69e..35c74766 100644 --- a/cookbook/tests/other/test_url_import.py +++ b/cookbook/tests/other/test_url_import.py @@ -3,9 +3,10 @@ import pytest from django.urls import reverse -from ._recipes import (ALLRECIPES, AMERICAS_TEST_KITCHEN, CHEF_KOCH, COOKPAD, - COOKS_COUNTRY, DELISH, FOOD_NETWORK, GIALLOZAFFERANO, JOURNAL_DES_FEMMES, - MADAME_DESSERT, MARMITON, TASTE_OF_HOME, TUDOGOSTOSO) +from ._recipes import ( + ALLRECIPES, AMERICAS_TEST_KITCHEN, CHEF_KOCH, COOKPAD, + COOKS_COUNTRY, DELISH, FOOD_NETWORK, GIALLOZAFFERANO, JOURNAL_DES_FEMMES, + MADAME_DESSERT, MARMITON, TASTE_OF_HOME, TUDOGOSTOSO) IMPORT_SOURCE_URL = 'api_recipe_from_source' DATA_DIR = "cookbook/tests/other/test_data/"