fix: formating and minor issues

open-craft · Jul 19, 2023 · 4b76c89 · 4b76c89
1 parent 57c3aaf
commit 4b76c89
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/openedx_tagging/core/tagging/rest_api/v1/views.py b/openedx_tagging/core/tagging/rest_api/v1/views.py
@@ -2,8 +2,6 @@
 Tagging API Views
 """
 from django.http import Http404
-from rest_framework import status
-from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 
 from ...api import (

diff --git a/tests/openedx_tagging/core/tagging/test_views.py b/tests/openedx_tagging/core/tagging/test_views.py
@@ -12,6 +12,7 @@
 
 User = get_user_model()
 
+
 @ddt.ddt
 class TestTaxonomyViewSet(APITestCase):
     def setUp(self):
@@ -30,7 +31,7 @@ def setUp(self):
 
     @ddt.data(
         (None, status.HTTP_200_OK, 3),
-        (1, status.HTTP_200_OK,2),
+        (1, status.HTTP_200_OK, 2),
         (0, status.HTTP_200_OK, 1),
         (True, status.HTTP_200_OK, 2),
         (False, status.HTTP_200_OK, 1),
@@ -53,7 +54,7 @@ def test_list_taxonomy_queryparams(self, enabled, expected_status, expected_coun
             response = self.client.get(url, {"enabled": enabled})
         else:
             response = self.client.get(url)
-        assert response.status_code, expected_status
+        assert response.status_code == expected_status
 
         # If we were able to list the taxonomies, check that we got the expected number back
         if status.is_success(expected_status):
@@ -68,18 +69,21 @@ def test_list_taxonomy_queryparams(self, enabled, expected_status, expected_coun
     def test_list_taxonomy(self, user_attr, expected_status):
         url = reverse("oel_tagging:taxonomy-list")
 
-
         if user_attr:
             user = getattr(self, user_attr)
             self.client.force_authenticate(user=user)
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, expected_status)
+        assert response.status_code == expected_status
 
     @ddt.data(
         (None, {"enabled": True}, status.HTTP_403_FORBIDDEN),
         (None, {"enabled": False}, status.HTTP_403_FORBIDDEN),
-        ("user", {"enabled": True}, status.HTTP_200_OK),
+        (
+            "user",
+            {"enabled": True},
+            status.HTTP_200_OK,
+        ),  # ToDo: Verify permission for user
         ("user", {"enabled": False}, status.HTTP_404_NOT_FOUND),
         ("staff", {"enabled": True}, status.HTTP_200_OK),
         ("staff", {"enabled": False}, status.HTTP_200_OK),
@@ -95,7 +99,7 @@ def test_detail_taxonomy(self, user_attr, taxonomy_data, expected_status):
             self.client.force_authenticate(user=user)
 
         response = self.client.get(url)
-        self.assertEqual(response.status_code, expected_status)
+        assert response.status_code == expected_status
 
         if status.is_success(expected_status):
             self.assertGreaterEqual(response.data.items(), create_data.items())
@@ -105,7 +109,7 @@ def test_detail_taxonomy_404(self):
 
         self.client.force_authenticate(user=self.staff)
         response = self.client.get(url)
-        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+        assert response.status_code == status.HTTP_404_NOT_FOUND
 
     @ddt.data(
         (None, status.HTTP_403_FORBIDDEN),
@@ -129,7 +133,7 @@ def test_create_taxonomy(self, user_attr, expected_status):
             self.client.force_authenticate(user=user)
 
         response = self.client.post(url, create_data)
-        self.assertEqual(response.status_code, expected_status)
+        assert response.status_code == expected_status
 
         # If we were able to create the taxonomy, check if it was created
         if status.is_success(expected_status):
@@ -150,7 +154,7 @@ def test_create_taxonomy_error(self, create_data):
 
         self.client.force_authenticate(user=self.staff)
         response = self.client.post(url, create_data)
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        assert response.status_code == status.HTTP_400_BAD_REQUEST
 
     @ddt.data({"name": "System defined taxonomy", "system_defined": True})
     def test_create_taxonomy_system_defined(self, create_data):
@@ -161,8 +165,8 @@ def test_create_taxonomy_system_defined(self, create_data):
 
         self.client.force_authenticate(user=self.staff)
         response = self.client.post(url, create_data)
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        self.assertEqual(response.data["system_defined"], False)
+        assert response.status_code == status.HTTP_201_CREATED
+        assert response.data["system_defined"] == False
 
     @ddt.data(
         (None, status.HTTP_403_FORBIDDEN),
@@ -185,14 +189,15 @@ def test_update_taxonomy(self, user_attr, expected_status):
             self.client.force_authenticate(user=user)
 
         response = self.client.put(url, {"name": "new name"})
-        self.assertEqual(response.status_code, expected_status)
+        assert response.status_code == expected_status
 
         # If we were able to update the taxonomy, check if the name changed
         if status.is_success(expected_status):
             response = self.client.get(url)
-            self.assertEqual(response.data["name"], "new name")
-            self.assertEqual(response.data["enabled"], False)
-            self.assertEqual(response.data["description"], "taxonomy description")
+            self.assertGreaterEqual(response.data.items(), taxonomy.values().items())
+            # self.assertEqual(response.data["name"], "new name")
+            # self.assertEqual(response.data["enabled"], False)
+            # self.assertEqual(response.data["description"], "taxonomy description")
 
     def test_update_taxonomy_system_defined(self):
         taxonomy = Taxonomy.objects.create(