Updates tests

bookwyrm/static/js/bookwyrm.js

@@ -122,6 +122,11 @@ let BookWyrm = new (class {
      */
     updateCountElement(counter, data) {
         let count = data.count;
+
+        if (count === undefined) {
+            return;
+        }
+
         const currentCount = counter.innerText;
         const hasMentions = data.has_mentions;
 

bookwyrm/tests/views/test_updates.py

@@ -45,31 +45,51 @@ class UpdateViews(TestCase):
         data = json.loads(result.getvalue())
         self.assertEqual(data["count"], 1)
 
-    def test_get_unread_status_count(self):
+    def test_get_unread_status_string(self):
         """there are so many views, this just makes sure it LOADS"""
         request = self.factory.get("")
         request.user = self.local_user
 
         with patch(
             "bookwyrm.activitystreams.ActivityStream.get_unread_count"
-        ) as mock_count:
+        ) as mock_count, patch(
-            with patch(
+            "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type"
-                # pylint:disable=line-too-long
+        ) as mock_count_by_status:
-                "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type"
+            mock_count.return_value = 3
-            ) as mock_count_by_status:
+            mock_count_by_status.return_value = {"review": 5}
-                mock_count.return_value = 3
+            result = views.get_unread_status_string(request, "home")
-                mock_count_by_status.return_value = {"review": 5}
-                result = views.get_unread_status_count(request, "home")
 
         self.assertIsInstance(result, JsonResponse)
         data = json.loads(result.getvalue())
-        self.assertEqual(data["count"], 3)
+        self.assertEqual(data["count"], "Load 5 unread statuses")
-        self.assertEqual(data["count_by_type"]["review"], 5)
 
-    def test_get_unread_status_count_invalid_stream(self):
+    def test_get_unread_status_string_with_filters(self):
+        """there are so many views, this just makes sure it LOADS"""
+        self.local_user.feed_status_types = ["comment", "everything"]
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.get_unread_count"
+        ) as mock_count, patch(
+            "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type"
+        ) as mock_count_by_status:
+            mock_count.return_value = 3
+            mock_count_by_status.return_value = {
+                "generated_note": 1,
+                "comment": 1,
+                "review": 10,
+            }
+            result = views.get_unread_status_string(request, "home")
+
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["count"], "Load 2 unread statuses")
+
+    def test_get_unread_status_string_invalid_stream(self):
         """there are so many views, this just makes sure it LOADS"""
         request = self.factory.get("")
         request.user = self.local_user
 
         with self.assertRaises(Http404):
-            views.get_unread_status_count(request, "fish")
+            views.get_unread_status_string(request, "fish")

bookwyrm/views/updates.py

@@ -25,7 +25,6 @@ def get_unread_status_string(request, stream="home"):
         raise Http404
 
     counts_by_type = stream.get_unread_count_by_status_type(request.user).items()
-    print(counts_by_type)
     if counts_by_type == {}:
         count = stream.get_unread_count(request.user)
     else:
@@ -39,8 +38,11 @@ def get_unread_status_string(request, stream="home"):
             if k not in ["review", "comment", "quotation"]
         )
 
+    if not count:
+        return JsonResponse({})
+
     translation_string = lambda c: ngettext(
         "Load %(count)d unread status", "Load %(count)d unread statuses", c
     ) % {"count": c}
 
-    return JsonResponse({"total": translation_string(count)})
+    return JsonResponse({"count": translation_string(count)})