update url in tests, fix passing headers as positional args bug and handle IntegrityError in test_create_category_duplicate_name

Author: piyush-jaiswal

tests/conftest.py

@@ -58,7 +58,7 @@ def _create(name, subcategories=None, headers=None):
         payload = {"name": name}
         if subcategories is not None:
             payload["subcategories"] = subcategories
-        return client.post("/category/create", json=payload, headers=headers)
+        return client.post("/categories", json=payload, headers=headers)
 
     return _create
 

tests/test_category.py

@@ -1,4 +1,7 @@
+import sqlite3
+
 import pytest
+from sqlalchemy.exc import IntegrityError
 
 from app.models import Category
 from tests import utils
@@ -36,19 +39,23 @@ def test_create_category(self, create_category):
         assert "id" in data
         self._verify_category_in_db(self.TEST_CATEGORY_NAME)
 
-    def test_create_category_duplicate_name(self, create_category):
-        create_category(self.TEST_CATEGORY_NAME)
-        response = create_category(self.TEST_CATEGORY_NAME)
+    def test_create_category_duplicate_name(self, create_category, create_authenticated_headers):
+        headers = create_authenticated_headers()
+        create_category(self.TEST_CATEGORY_NAME, headers=headers)
 
-        assert response.status_code == 500
+        with pytest.raises(IntegrityError) as ie:
+            create_category(self.TEST_CATEGORY_NAME, headers=headers)
+
+        assert isinstance(ie.value.orig, sqlite3.IntegrityError)
+        assert "UNIQUE constraint failed" in str(ie.value.orig)
         assert self._count_categories() == 1
         self._verify_category_in_db(self.TEST_CATEGORY_NAME)
 
     def test_get_category_by_id(self, create_category):
         response = create_category("Books")
         data = response.get_json()
         cat_id = data["id"]
-        get_resp = self.client.get(f"/category/{cat_id}")
+        get_resp = self.client.get(f"/categories/{cat_id}")
 
         assert get_resp.status_code == 200
         data = get_resp.get_json()
@@ -70,14 +77,14 @@ def test_get_all_categories(self, create_category):
 
     def test_update_category(self, create_authenticated_headers, create_category):
         headers = create_authenticated_headers()
-        response = create_category("OldName", headers)
+        response = create_category("OldName", headers=headers)
         data = response.get_json()
         cat_id = data["id"]
         update_resp = self.client.put(
-            f"/category/{cat_id}/update", json={"name": "NewName"}, headers=headers
+            f"/categories/{cat_id}", json={"name": "NewName"}, headers=headers
         )
 
-        assert update_resp.status_code == 201
+        assert update_resp.status_code == 200
         data = update_resp.get_json()
         assert data["name"] == "NewName"
         assert data["id"] == cat_id
@@ -87,13 +94,13 @@ def test_update_category(self, create_authenticated_headers, create_category):
 
     def test_delete_category(self, create_authenticated_headers, create_category):
         headers = create_authenticated_headers()
-        response = create_category("ToDelete", headers)
+        response = create_category("ToDelete", headers=headers)
         data = response.get_json()
         cat_id = data["id"]
-        delete_resp = self.client.delete(f"/category/{cat_id}", headers=headers)
+        delete_resp = self.client.delete(f"/categories/{cat_id}", headers=headers)
 
-        assert delete_resp.status_code == 200
-        get_resp = self.client.get(f"/category/{cat_id}")
+        assert delete_resp.status_code == 204
+        get_resp = self.client.get(f"/categories/{cat_id}")
         assert get_resp.status_code == 404
         self._verify_category_in_db("ToDelete", should_exist=False)
 
@@ -108,7 +115,7 @@ def test_delete_category(self, create_authenticated_headers, create_category):
     def test_create_category_token_error(self, get_headers, expected_code):
         headers = get_headers(self)
         response = self.client.post(
-            "/category/create", json={"name": "CreateTokenError"}, headers=headers
+            "/categories", json={"name": "CreateTokenError"}, headers=headers
         )
         utils.verify_token_error_response(response, expected_code)
         self._verify_category_in_db("CreateTokenError", should_exist=False)
@@ -121,15 +128,14 @@ def test_create_category_token_error(self, get_headers, expected_code):
             (lambda self: None, "authorization_required")
         ]
     )
-    def test_update_category_token_error(self, get_headers, create_category, create_authenticated_headers, expected_code):
-        headers = create_authenticated_headers()
-        response = create_category("UpdateTokenError", headers)
+    def test_update_category_token_error(self, get_headers, create_category, expected_code):
+        response = create_category("UpdateTokenError")
         data = response.get_json()
         cat_id = data["id"]
 
         update_headers = get_headers(self)
         update_resp = self.client.put(
-            f"/category/{cat_id}/update",
+            f"/categories/{cat_id}",
             json={"name": "UpdatedName"},
             headers=update_headers,
         )
@@ -146,14 +152,13 @@ def test_update_category_token_error(self, get_headers, create_category, create_
             (lambda self: None, "authorization_required")
         ]
     )
-    def test_delete_category_token_error(self, get_headers, create_category, create_authenticated_headers, expected_code):
-        headers = create_authenticated_headers()
-        response = create_category("DeleteTokenError", headers)
+    def test_delete_category_token_error(self, get_headers, create_category, expected_code):
+        response = create_category("DeleteTokenError")
         data = response.get_json()
         cat_id = data["id"]
 
         delete_headers = get_headers(self)
-        delete_resp = self.client.delete(f"/category/{cat_id}", headers=delete_headers)
+        delete_resp = self.client.delete(f"/categories/{cat_id}", headers=delete_headers)
 
         utils.verify_token_error_response(delete_resp, expected_code)
         self._verify_category_in_db("DeleteTokenError")

tests/test_relationships.py

@@ -1,6 +1,6 @@
 import pytest
 
-from app.models import Category, Subcategory, Product
+from app.models import Category, Product, Subcategory
 
 
 class TestRelationships:
@@ -91,8 +91,8 @@ def test_update_category_adds_subcategories(self, create_authenticated_headers,
         category = create_category("U_Cat", subcategories=[subcategory1["id"]]).get_json()
 
         headers = create_authenticated_headers()
-        update_response = self.client.put(f"/category/{category['id']}/update", json={"subcategories": [subcategory2["id"]]}, headers=headers)
-        assert update_response.status_code == 201
+        update_response = self.client.put(f"/categories/{category['id']}", json={"subcategories": [subcategory2["id"]]}, headers=headers)
+        assert update_response.status_code == 200
 
         assert self._category_subcategory_ids(category["id"]) == sorted([subcategory1["id"], subcategory2["id"]])
 
@@ -127,20 +127,20 @@ def test_update_product_adds_subcategories(self, create_authenticated_headers, c
 
     def test_get_category_subcategories_empty(self, create_category):
         category = create_category("Cat_NoSC").get_json()
-        resp = self.client.get(f"/category/{category['id']}/subcategories")
+        resp = self.client.get(f"/categories/{category['id']}/subcategories")
         self._assert_related_collection(resp, "subcategories")
 
     def test_get_category_subcategories_populated(self, create_category, create_subcategory):
         subcategory1 = create_subcategory("SC1").get_json()
         subcategory2 = create_subcategory("SC2").get_json()
         category = create_category("Cat_WithSC", subcategories=[subcategory1["id"], subcategory2["id"]]).get_json()
 
-        resp = self.client.get(f"/category/{category['id']}/subcategories")
+        resp = self.client.get(f"/categories/{category['id']}/subcategories")
         self._assert_related_collection(resp, "subcategories", expected_ids=[subcategory1["id"], subcategory2["id"]])
 
     def test_get_category_products_empty(self, create_category):
         category = create_category("Cat_NoProd").get_json()
-        resp = self.client.get(f"/category/{category['id']}/products")
+        resp = self.client.get(f"/categories/{category['id']}/products")
         self._assert_related_collection(resp, "products")
 
     def test_get_category_products_populated_with_pagination(self, create_category, create_subcategory, create_product):
@@ -152,8 +152,8 @@ def test_get_category_products_populated_with_pagination(self, create_category,
             product_resp = create_product(f"P{index}", "desc", subcategories=[subcategory["id"]])
             product_ids.add(product_resp.get_json().get("id"))
 
-        page1 = self.client.get(f"/category/{category['id']}/products?page=1").get_json()
-        page2 = self.client.get(f"/category/{category['id']}/products?page=2").get_json()
+        page1 = self.client.get(f"/categories/{category['id']}/products?page=1").get_json()
+        page2 = self.client.get(f"/categories/{category['id']}/products?page=2").get_json()
         assert len(page1["products"]) == 10
         assert len(page2["products"]) == 2
 
@@ -210,8 +210,8 @@ def test_get_product_subcategories_populated(self, create_product, create_subcat
     @pytest.mark.parametrize(
         "path",
         [
-            "/category/999999/subcategories",
-            "/category/999999/products",
+            "/categories/999999/subcategories",
+            "/categories/999999/products",
             "/subcategory/999999/categories",
             "/subcategory/999999/products",
             "/product/999999/subcategories",