From 7b5408ed4c687a4648860592cf8364bcec85a47a Mon Sep 17 00:00:00 2001
From: Marnanel Thurman <marnanel@thurman.org.uk>
Date: Thu, 27 Sep 2018 17:53:25 +0100
Subject: [PATCH] Sort out model identifiers in things_for_testing

---
 tests/tests_collection.py   | 12 +++++++++---
 things_for_testing/views.py |  8 ++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/tests_collection.py b/tests/tests_collection.py
index b6ffe7a..d27a498 100644
--- a/tests/tests_collection.py
+++ b/tests/tests_collection.py
@@ -169,7 +169,11 @@ class CollectionTests(TestCase):
                 path=path,
                 page_number=1,
                 expectedTotalItems=3,
-                expectedOnPage=['alice', 'bob', 'carol'],
+                expectedOnPage=[
+                    'https://example.com/user/alice',
+                    'https://example.com/user/bob',
+                    'https://example.com/user/carol',
+                    ],
                 )
 
         for name in ['alice', 'bob', 'carol']:
@@ -185,7 +189,9 @@ class CollectionTests(TestCase):
                     path=path,
                     page_number=1,
                     expectedTotalItems=1,
-                    expectedOnPage=['alice'],
-                    )
+                    expectedOnPage=[
+                        'https://example.com/user/alice',
+                    ],
+                     )
 
 
diff --git a/things_for_testing/views.py b/things_for_testing/views.py
index 161af9e..1511e6a 100644
--- a/things_for_testing/views.py
+++ b/things_for_testing/views.py
@@ -15,23 +15,23 @@ class ThingUserFollowingView(CollectionView):
     def get_collection_items(self, *args, **kwargs):
         return Activity.objects.filter(
                 f_type='Follow',
-                f_actor=ThingUser(name=kwargs['name']).url,
+                f_actor=ThingUser(name=kwargs['name']).activity_id,
                 accepted=True,
                 )
 
     def _stringify_object(self, obj):
-        return ThingUser.objects.get(actor=obj.following).url
+        return obj.f_object
 
 class ThingUserFollowersView(CollectionView):
 
     def get_collection_items(self, *args, **kwargs):
         return Activity.objects.filter(
                 f_type='Follow',
-                f_object=ThingUser(name=kwargs['name']).url,
+                f_object=ThingUser(name=kwargs['name']).activity_id,
                 accepted=True,
                 )
 
     def _stringify_object(self, obj):
-        return ThingUser.objects.get(actor=obj.follower).url
+        return obj.f_actor