update test dependencies and fix error in ChangesetCommentsView

Author: willemarcel

osmchadjango/changeset/tests/test_changeset_views.py

@@ -1263,52 +1263,3 @@ def test_set_harmful_by_staff_user(self):
                 )
         self.assertEqual(response.status_code, 200)
         self.assertEqual(Changeset.objects.filter(checked=True).count(), 5)
-
-class TestChangesetCommentsView(APITestCase):
-    def setUp(self):
-        self.changeset = HarmfulChangesetFactory(
-            id=55736682,
-            )
-        HarmfulChangesetFactory(id=1343)
-        self.user = User.objects.create_user(
-            username='test',
-            password='password',
-            email='[email protected]',
-            )
-        UserSocialAuth.objects.create(
-            user=self.user,
-            provider='openstreetmap',
-            uid='123123',
-            )
-
-    def test_unauthenticated_changeset_detail_response(self):
-        response = self.client.get(
-            reverse('changeset:comment-list', args=[self.changeset.id])
-            )
-        self.assertEqual(response.status_code, 401)
-
-    def test_authenticated_changeset_detail_response(self):
-        self.client.login(username=self.user.username, password='password')
-        response = self.client.get(
-            reverse('changeset:comment', args=[self.changeset.id])
-            )
-
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue(len(response.data) > 0)
-
-    def test_changeset_does_not_exist(self):
-        self.client.login(username=self.user.username, password='password')
-        response = self.client.get(
-            reverse('changeset:comment', args=[1234])
-            )
-
-        self.assertEqual(response.status_code, 404)
-
-    def test_changeset_without_comments(self):
-        self.client.login(username=self.user.username, password='password')
-        response = self.client.get(
-            reverse('changeset:comment', args=[1343])
-            )
-
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.data, [])

osmchadjango/changeset/tests/test_comment_views.py

@@ -8,7 +8,7 @@
 from social_django.models import UserSocialAuth
 from rest_framework.test import APITestCase
 from requests_oauthlib import OAuth1Session
-import mock
+from unittest import mock
 
 from ...users.models import User
 from ..models import Changeset
@@ -160,3 +160,53 @@ def test_comment_changeset_doesnt_exist(self):
             )
 
         self.assertEqual(response.status_code, 404)
+
+
+class TestChangesetCommentsView(APITestCase):
+    def setUp(self):
+        self.changeset = HarmfulChangesetFactory(
+            id=55736682,
+            )
+        HarmfulChangesetFactory(id=1343)
+        self.user = User.objects.create_user(
+            username='test',
+            password='password',
+            email='[email protected]',
+            )
+        UserSocialAuth.objects.create(
+            user=self.user,
+            provider='openstreetmap',
+            uid='123123',
+            )
+
+    def test_unauthenticated_changeset_detail_response(self):
+        response = self.client.get(
+            reverse('changeset:comment', args=[self.changeset.id])
+            )
+        self.assertEqual(response.status_code, 401)
+
+    def test_authenticated_changeset_detail_response(self):
+        self.client.login(username=self.user.username, password='password')
+        response = self.client.get(
+            reverse('changeset:comment', args=[self.changeset.id])
+            )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue(len(response.data) > 0)
+
+    def test_changeset_does_not_exist(self):
+        self.client.login(username=self.user.username, password='password')
+        response = self.client.get(
+            reverse('changeset:comment', args=[1234])
+            )
+
+        self.assertEqual(response.status_code, 404)
+
+    def test_changeset_without_comments(self):
+        self.client.login(username=self.user.username, password='password')
+        response = self.client.get(
+            reverse('changeset:comment', args=[1343])
+            )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.data, [])

osmchadjango/changeset/tests/test_tasks.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from mock import patch
+from unittest.mock import patch
 from urllib.parse import quote
 
 from django.test import TestCase

osmchadjango/changeset/views.py

@@ -482,7 +482,16 @@ def get_comments(self, request, pk):
             'https://osm-comments-api.mapbox.com/api/v1/changesets/{}'.format(pk),
             headers=headers
             )
-        return data.get('properties').get('comments')
+        if data.status_code != 200:
+            return Response(
+                data.json(),
+                status=data.status_code
+                )
+        else:
+            return Response(
+                data.json().get('properties').get('comments'),
+                status=status.HTTP_200_OK
+                )
 
     @detail_route(methods=['post'])
     def post_comment(self, request, pk):

requirements/test.txt

@@ -1,6 +1,5 @@
 # Test dependencies go here.
 -r base.txt
-flake8==3.5.0
-django-test-plus==1.0.22
-factory-boy==2.9.2
-mock==2.0.0
+flake8==3.6.0
+django-test-plus==1.1.1
+factory-boy==2.11.1