diff --git a/src/tests/api/test_events.py b/src/tests/api/test_events.py index be4e9d291..f75d45d35 100644 --- a/src/tests/api/test_events.py +++ b/src/tests/api/test_events.py @@ -1,4 +1,4 @@ -from datetime import datetime, timedelta +from datetime import datetime from decimal import Decimal from unittest import mock @@ -7,9 +7,7 @@ from django.conf import settings from django_countries.fields import Country from pytz import UTC -from pretix.base.models import ( - CartPosition, Event, InvoiceAddress, Order, OrderPosition, -) +from pretix.base.models import Event, InvoiceAddress, Order, OrderPosition from pretix.base.models.orders import OrderFee @@ -56,24 +54,6 @@ def order_position(item, order, taxrule, variations): return op -@pytest.fixture -def cart_position(event, item, variations): - testtime = datetime(2017, 12, 1, 10, 0, 0, tzinfo=UTC) - - with mock.patch('django.utils.timezone.now') as mock_now: - mock_now.return_value = testtime - c = CartPosition.objects.create( - event=event, - item=item, - datetime=datetime.now(), - expires=datetime.now() + timedelta(days=1), - variation=variations[0], - price=Decimal("23"), - cart_id="z3fsn8jyufm5kpk768q69gkbyr5f4h6w" - ) - return c - - TEST_EVENT_RES = { "name": {"en": "Dummy"}, "live": False, diff --git a/src/tests/api/test_oauth.py b/src/tests/api/test_oauth.py index 0dba619c8..32d9bbfbc 100644 --- a/src/tests/api/test_oauth.py +++ b/src/tests/api/test_oauth.py @@ -3,12 +3,11 @@ import json import pytest from django.utils.http import urlquote -from django.utils.timezone import now from pretix.api.models import ( OAuthAccessToken, OAuthApplication, OAuthGrant, OAuthRefreshToken, ) -from pretix.base.models import Event, Organizer, Team, User +from pretix.base.models import Organizer, Team, User @pytest.fixture @@ -16,15 +15,6 @@ def organizer(): return Organizer.objects.create(name='Dummy', slug='dummy') -@pytest.fixture -def event(organizer): - event = Event.objects.create( - organizer=organizer, name='Dummy', slug='dummy', - date_from=now() - ) - return event - - @pytest.fixture def admin_team(organizer): return Team.objects.create(organizer=organizer, can_change_teams=True, name='Admin team', all_events=True, diff --git a/src/tests/plugins/test_sendmail.py b/src/tests/plugins/test_sendmail.py index 969bef9c6..e3b28cc2a 100644 --- a/src/tests/plugins/test_sendmail.py +++ b/src/tests/plugins/test_sendmail.py @@ -5,7 +5,7 @@ from django.core import mail as djmail from django.utils.timezone import now from pretix.base.models import ( - Event, Item, ItemCategory, Order, OrderPosition, Organizer, Team, User, + Event, Item, Order, OrderPosition, Organizer, Team, User, ) @@ -27,12 +27,6 @@ def item(event): return Item.objects.create(name='Test item', event=event, default_price=13) -@pytest.fixture -def item_category(event): - """Returns an item category instance""" - return ItemCategory.objects.create(event=event) - - @pytest.fixture def order(item): """Returns an order instance"""