Fixing test issue and add overriden decorator

Author: gmaOCR

oscarapi/tests/unit/testadminapi.py

@@ -80,6 +80,7 @@ def test_root_view(self):
             "partners",
             "users",
             "attributeoptiongroups",
+            "baskets",
         ]
 
         for api in admin_apis:

oscarapi/tests/unit/testbasket.py

@@ -1,4 +1,5 @@
 import json
+from unittest import skipIf
 
 from unittest.mock import patch
 from django.test import override_settings
@@ -9,6 +10,7 @@
 
 from oscarapi.basket.operations import get_basket, get_user_basket
 from oscarapi.tests.utils import APITest
+from oscarapi import settings
 
 
 Basket = get_model("basket", "Basket")
@@ -49,7 +51,8 @@ def test_basket_api_create_not_possible(self):
 
         # authenticated
         self.login("nobody", "nobody")
-        data = {"owner": "http://testserver%s" % reverse("user-detail", args=[2])}
+        data = {"owner": "http://testserver%s" %
+                reverse("user-detail", args=[2])}
 
         self.response = self.client.post(
             url, json.dumps(data), content_type="application/json"
@@ -61,7 +64,8 @@ def test_basket_api_create_not_possible(self):
         # admin
         self.login("admin", "admin")
 
-        data = {"owner": "http://testserver%s" % reverse("user-detail", args=[1])}
+        data = {"owner": "http://testserver%s" %
+                reverse("user-detail", args=[1])}
         self.response = self.client.post(
             url, json.dumps(data), content_type="application/json"
         )
@@ -124,23 +128,27 @@ def test_retrieve_basket_header(self):
 
         # authenticated
         self.hlogin("nobody", "nobody", session_id="nobody")
-        self.response = self.get("api-basket", session_id="nobody", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
         self.response.assertObjectIdEqual("owner", 2)
         basket_id = self.response["id"]
 
-        self.response = self.get("api-basket", session_id="nobody", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
         self.response.assertValueEqual("id", basket_id)
 
         # admin
         self.hlogin("admin", "admin", session_id="admin")
-        self.response = self.get("api-basket", session_id="admin", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="admin", authenticated=True)
         self.response.assertStatusEqual(200)
         self.response.assertObjectIdEqual("owner", 1)
         basket_id = self.response["id"]
 
-        self.response = self.get("api-basket", session_id="admin", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="admin", authenticated=True)
         self.response.assertStatusEqual(200)
         self.response.assertValueEqual("id", basket_id)
 
@@ -234,7 +242,8 @@ def test_basket_read_permissions(self):
 
         url = reverse("basket-lines-list", args=(1,))
         self.response = self.client.get(url)
-        self.response.assertStatusEqual(403, "Users not access other peoples baskets.")
+        self.response.assertStatusEqual(
+            403, "Users not access other peoples baskets.")
 
         self.assertEqual(
             Basket.objects.count(),
@@ -286,7 +295,8 @@ def test_basket_read_permissions_header(self):
 
         # now try for authenticated user.
         self.hlogin("nobody", "nobody", session_id="nobody")
-        self.response = self.get("api-basket", session_id="nobody", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
 
         # try to access the urls in the response.
@@ -321,7 +331,8 @@ def test_basket_read_permissions_header(self):
         )
 
         self.hlogin("admin", "admin", session_id="admin")
-        self.response = self.get("api-basket", session_id="admin", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="admin", authenticated=True)
         self.response.assertStatusEqual(200)
 
         # try to access the urls in the response.
@@ -560,7 +571,8 @@ def test_basket_write_permissions_header_authenticated(self):
 
         # now try for authenticated user.
         self.hlogin("nobody", "nobody", session_id="nobody")
-        self.response = self.get("api-basket", session_id="nobody", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
 
         # try to access the urls in the response.
@@ -606,11 +618,13 @@ def test_basket_write_permissions_header_authenticated(self):
         self.response.assertStatusEqual(201)
 
         # throw the basket away
-        self.response = self.delete(url, session_id="nobody", authenticated=True)
+        self.response = self.delete(
+            url, session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(204)
 
         # now lets start messing around
-        self.response = self.get("api-basket", session_id="nobody", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
         basket_id = self.response["id"]
 
@@ -650,7 +664,8 @@ def test_basket_write_permissions_header_authenticated(self):
         self.response.assertStatusEqual(403)
 
         # try to delete someone else's basket
-        self.response = self.delete(url, session_id="nobody", authenticated=True)
+        self.response = self.delete(
+            url, session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(403)
 
         # try adding lines to someone else's basket
@@ -739,7 +754,8 @@ def test_basket_write_permissions_admin(self):
 
             # try to write to someone else's basket by sending the primary key
             # along.
-            self.response = self.put(url, status="Saved", id=somebody_basket_id)
+            self.response = self.put(
+                url, status="Saved", id=somebody_basket_id)
             self.response.assertStatusEqual(200)
             self.response.assertValueEqual(
                 "id", basket_id, "Primary key value can not be changed."
@@ -775,7 +791,8 @@ def test_basket_write_permissions_header_admin(self):
 
         # now try for authenticated user.
         self.hlogin("admin", "admin", session_id="admin")
-        self.response = self.get("api-basket", session_id="admin", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="admin", authenticated=True)
         self.response.assertStatusEqual(200)
 
         # try to access the urls in the response.
@@ -821,11 +838,13 @@ def test_basket_write_permissions_header_admin(self):
         self.response.assertStatusEqual(201)
 
         # throw the basket away
-        self.response = self.delete(url, session_id="admin", authenticated=True)
+        self.response = self.delete(
+            url, session_id="admin", authenticated=True)
         self.response.assertStatusEqual(204)
 
         # now lets start messing around
-        self.response = self.get("api-basket", session_id="admin", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="admin", authenticated=True)
         self.response.assertStatusEqual(200)
         basket_id = self.response["id"]
 
@@ -882,7 +901,8 @@ def test_basket_write_permissions_header_admin(self):
         self.response.assertStatusEqual(403)
 
         # try to delete someone else's basket
-        self.response = self.delete(url, session_id="admin", authenticated=True)
+        self.response = self.delete(
+            url, session_id="admin", authenticated=True)
         self.response.assertStatusEqual(403)
 
     def test_add_product_anonymous(self):
@@ -929,7 +949,8 @@ def test_add_product_basket_addition_signal_send(self, mock):
         self.assertTrue(mock.called)
 
         signal_arguments = mock.call_args[1]
-        self.assertEqual(signal_arguments["product"], Product.objects.get(pk=1))
+        self.assertEqual(
+            signal_arguments["product"], Product.objects.get(pk=1))
         self.assertEqual(signal_arguments["user"].username, "nobody")
 
         # see if we can get the basket from the request
@@ -953,7 +974,8 @@ def test_basket_line_permissions(self):
 
         self.response = self.get(line0url)
         self.response.assertStatusEqual(200)
-        self.response.assertValueEqual("product", "http://testserver/api/products/1/")
+        self.response.assertValueEqual(
+            "product", "http://testserver/api/products/1/")
         self.response.assertValueEqual("quantity", 5)
 
         # now let's try to cheat
@@ -964,7 +986,8 @@ def test_basket_line_permissions(self):
     def test_basket_line_permissions_header(self):
         "A user's Basket lines can not be viewed by another user in any way, even with header authentication"
         self.hlogin("nobody", "nobody", session_id="nobody")
-        self.response = self.get("api-basket", session_id="nobody", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
 
         self.response = self.post(
@@ -981,14 +1004,17 @@ def test_basket_line_permissions_header(self):
         line0 = self.response.body[0]
         line0url = line0["url"]
 
-        self.response = self.get(line0url, session_id="nobody", authenticated=True)
+        self.response = self.get(
+            line0url, session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
-        self.response.assertValueEqual("product", "http://testserver/api/products/1/")
+        self.response.assertValueEqual(
+            "product", "http://testserver/api/products/1/")
         self.response.assertValueEqual("quantity", 5)
 
         # now let's try to cheat
         self.hlogin("somebody", "somebody", session_id="somebody")
-        self.response = self.get(line0url, session_id="somebody", authenticated=True)
+        self.response = self.get(
+            line0url, session_id="somebody", authenticated=True)
         self.response.assertStatusEqual(404)
 
     def test_frozen_basket_can_not_be_accessed(self):
@@ -1009,7 +1035,8 @@ def test_frozen_basket_can_not_be_accessed(self):
     def test_frozen_basket_can_not_be_accessed_header(self):
         "Prove that frozen baskets can no longer be accessed by the user, even with header authentication"
         self.hlogin("nobody", "nobody", session_id="nobody")
-        self.response = self.get("api-basket", session_id="nobody", authenticated=True)
+        self.response = self.get(
+            "api-basket", session_id="nobody", authenticated=True)
         self.response.assertStatusEqual(200)
         self.response.assertValueEqual("status", "Open")
 
@@ -1149,6 +1176,7 @@ def test_get_user_basket_with_multiple_baskets(self):
         self.assertEqual(user_basket, Basket.open.first())
 
 
+@skipIf(settings.BLOCK_ADMIN_API_ACCESS, "Admin API is enabled")
 class BasketAdminTest(APITest):
     """
     Test suite for admin basket list operations.
@@ -1349,15 +1377,17 @@ def test_basket_login_logout(self):
             self.client.cookies,
             "An basket cookie should have been created",
         )
-        self.assertStartsWith(self.client.cookies["oscar_open_basket"].value, "1")
+        self.assertStartsWith(
+            self.client.cookies["oscar_open_basket"].value, "1")
 
         # retrieve the basket with oscarapi.
         self.response = self.get("api-basket")
         self.response.assertValueEqual(
             "owner", None, "The basket should not have an owner"
         )
         self.response.assertValueEqual("id", 1)
-        self.assertStartsWith(self.client.cookies["oscar_open_basket"].value, "1")
+        self.assertStartsWith(
+            self.client.cookies["oscar_open_basket"].value, "1")
 
         # now lets log in with oscarapi
         response = self.post("api-login", username="nobody", password="nobody")