Fixed #54: Now use pytest everywhere \o/

api/funkwhale_api/history/factories.py

@@ -1,9 +1,11 @@
 import factory
-from funkwhale_api.music.tests import factories
 
-from funkwhale_api.users.tests.factories import UserFactory
+from funkwhale_api.factories import registry
+from funkwhale_api.music import factories
+from funkwhale_api.users.factories import UserFactory
 
 
+@registry.register
 class ListeningFactory(factory.django.DjangoModelFactory):
     user = factory.SubFactory(UserFactory)
     track = factory.SubFactory(factories.TrackFactory)

api/funkwhale_api/history/tests/test_history.py

@@ -1,50 +0,0 @@
-import random
-import json
-from test_plus.test import TestCase
-from django.urls import reverse
-from django.core.exceptions import ValidationError
-from django.utils import timezone
-
-from funkwhale_api.music.tests.factories import TrackFactory
-
-from funkwhale_api.users.models import User
-from funkwhale_api.history import models
-
-
-class TestHistory(TestCase):
-
-    def setUp(self):
-        super().setUp()
-        self.user = User.objects.create_user(username='test', email='test@test.com', password='test')
-
-    def test_can_create_listening(self):
-        track = TrackFactory()
-        now = timezone.now()
-        l = models.Listening.objects.create(user=self.user, track=track)
-
-    def test_anonymous_user_can_create_listening_via_api(self):
-        track = TrackFactory()
-        url = self.reverse('api:v1:history:listenings-list')
-        response = self.client.post(url, {
-            'track': track.pk,
-        })
-
-        listening = models.Listening.objects.latest('id')
-
-        self.assertEqual(listening.track, track)
-        self.assertIsNotNone(listening.session_key)
-
-    def test_logged_in_user_can_create_listening_via_api(self):
-        track = TrackFactory()
-
-        self.client.login(username=self.user.username, password='test')
-
-        url = self.reverse('api:v1:history:listenings-list')
-        response = self.client.post(url, {
-            'track': track.pk,
-        })
-
-        listening = models.Listening.objects.latest('id')
-
-        self.assertEqual(listening.track, track)
-        self.assertEqual(listening.user, self.user)