Create new user rather than hijacking an existing one

Author: Maffooch

dojo/fixtures/dojo_testdata.json

@@ -112,6 +112,24 @@
       "date_joined": "2018-04-13T07:59:51.527Z"
     }
   },
+  {
+    "pk": 7,
+    "model": "auth.user",
+    "fields": {
+      "username": "globalWriter",
+      "first_name": "Global",
+      "last_name": "Writer",
+      "is_active": true,
+      "is_superuser": false,
+      "is_staff": false,
+      "last_login": null,
+      "groups": [],
+      "user_permissions": [],
+      "password": "pbkdf2_sha256$36000$pe8Ff8HrBPac$Lb3ee6/R9z/aL9nM+D2AXWTpIt9Pa9kcLueXxYNy1ZY=",
+      "email": "global_writer@email.com",
+      "date_joined": "2018-04-13T07:59:51.527Z"
+    }
+  },
   {
     "pk": "2dqr18yqu9mzb87abk0okid75w2clakl",
     "model": "sessions.session",
@@ -2804,6 +2822,14 @@
       "created": "2018-04-16T06:54:35.933Z"
     }
   },
+  {
+    "pk": "184770c4c3256aba904297610fbb4da3fa15ba36",
+    "model": "authtoken.token",
+    "fields": {
+      "user": 7,
+      "created": "2018-04-16T06:54:35.933Z"
+    }
+  },
   {
     "pk": "1",
     "model": "dojo.dojo_group",
@@ -2875,7 +2901,7 @@
     "pk": 4,
     "model": "dojo.global_role",
     "fields": {
-      "user": 4,
+      "user": 7,
       "role": 2
     }
   },

unittests/test_notifications.py

@@ -215,7 +215,7 @@ def test_product_types(self, mock):
         with self.subTest("product_type_added"):
             with set_actor(self.notification_tester), pghistory.context(user=self.notification_tester.id):
                 prod_type = Product_Type.objects.create(name="notif prod type")
-            self.assertEqual(mock.call_count, last_count + 4)
+            self.assertEqual(mock.call_count, last_count + 5)
             self.assertEqual(mock.call_args_list[-1].args[0], "product_type_added")
             self.assertEqual(mock.call_args_list[-1].kwargs["url"], f"/product/type/{prod_type.id}")
 
@@ -236,7 +236,7 @@ def test_products(self, mock):
             with set_actor(self.notification_tester), pghistory.context(user=self.notification_tester.id):
                 prod_type = Product_Type.objects.first()
                 prod, _ = Product.objects.get_or_create(prod_type=prod_type, name="prod name")
-            self.assertEqual(mock.call_count, last_count + 5)
+            self.assertEqual(mock.call_count, last_count + 6)
             self.assertEqual(mock.call_args_list[-1].args[0], "product_added")
             self.assertEqual(mock.call_args_list[-1].kwargs["url"], f"/product/{prod.id}")
 
@@ -257,7 +257,7 @@ def test_engagements(self, mock):
             with set_actor(self.notification_tester), pghistory.context(user=self.notification_tester.id):
                 prod = Product.objects.first()
                 eng = Engagement.objects.create(product=prod, target_start=timezone.now(), target_end=timezone.now())
-            self.assertEqual(mock.call_count, last_count + 5)
+            self.assertEqual(mock.call_count, last_count + 6)
             self.assertEqual(mock.call_args_list[-1].args[0], "engagement_added")
             self.assertEqual(mock.call_args_list[-1].kwargs["url"], f"/engagement/{eng.id}")
 
@@ -266,7 +266,7 @@ def test_engagements(self, mock):
             with set_actor(self.notification_tester), pghistory.context(user=self.notification_tester.id):
                 eng.status = "Completed"
                 eng.save()
-            self.assertEqual(mock.call_count, last_count + 5)
+            self.assertEqual(mock.call_count, last_count + 6)
             self.assertEqual(mock.call_args_list[-1].args[0], "engagement_closed")
             self.assertEqual(mock.call_args_list[-1].kwargs["url"], f"/engagement/{eng.id}/finding/all")
 
@@ -275,7 +275,7 @@ def test_engagements(self, mock):
             with set_actor(self.notification_tester), pghistory.context(user=self.notification_tester.id):
                 eng.status = "In Progress"
                 eng.save()
-            self.assertEqual(mock.call_count, last_count + 5)
+            self.assertEqual(mock.call_count, last_count + 6)
             self.assertEqual(mock.call_args_list[-1].args[0], "engagement_reopened")
             self.assertEqual(mock.call_args_list[-1].kwargs["url"], f"/engagement/{eng.id}")
 
@@ -376,7 +376,7 @@ def test_finding_groups(self, mock):
         with self.subTest("test_deleted itself"):
             with set_actor(self.notification_tester), pghistory.context(user=self.notification_tester.id):
                 fg2.delete()
-            self.assertEqual(mock.call_count, last_count + 5)
+            self.assertEqual(mock.call_count, last_count + 6)
             self.assertEqual(mock.call_args_list[-1].args[0], "finding_group_deleted")
             self.assertEqual(mock.call_args_list[-1].kwargs["description"], 'The finding group "fg test" was deleted by admin')
             self.assertEqual(mock.call_args_list[-1].kwargs["url"], f"/test/{test2.id}")

unittests/test_rest_framework.py

@@ -372,7 +372,7 @@ class BaseClass:
     class RESTEndpointTest(DojoAPITestCase):
         NOT_AUTHORIZED_USER_ID = 3
         GLOBAL_READER_USER_ID = 5
-        GLOBAL_WRITER_USER_ID = 4
+        GLOBAL_WRITER_USER_ID = 7
         GLOBAL_OWNER_USER_ID = 6
 
         def __init__(self, *args, **kwargs):