Merge pull request #206 from CubingZA/update/server-packages

Update/server packages
CubingZA · Dec 19, 2023 · 3196821 · 3196821
2 parents 2c3959b + 6934a51
commit 3196821
Show file tree

Hide file tree

Showing 4 changed files with 189 additions and 104 deletions.
diff --git a/server/api/users/user.controller.js b/server/api/users/user.controller.js
@@ -75,7 +75,7 @@ export function show(req, res, next) {
  */
 export function destroy(req, res) {
   let userId = sanitize(req.params.id);
-  return User.findByIdAndRemove(userId).exec()
+  return User.findByIdAndDelete(userId).exec()
     .then(function(user) {
       if(!user) {
         return res.status(404).end();

diff --git a/server/api/users/user.controller.test.js b/server/api/users/user.controller.test.js
@@ -232,9 +232,9 @@ describe ("User controller:", function() {
 
     describe('when the user ID is found', function() {
       beforeEach(async function() {
-        // mockingoose doesn't support findByIdAndRemove, so have to workaround
-        mockingoose(User).toReturn(mockUserData[0], 'findOneAndRemove');
-        User.findByIdAndRemove = jest.fn(User.findOneAndRemove);
+        // mockingoose doesn't support findByIdAndDelete, so have to workaround
+        mockingoose(User).toReturn(mockUserData[0], 'findOneAndDelete');
+        User.findByIdAndDelete = jest.fn(User.findOneAndDelete);
         req.params = {_id: "0"}
         await controller.destroy(req, res)
       });
@@ -243,8 +243,8 @@ describe ("User controller:", function() {
         expect(res.status).toHaveBeenCalledWith(204);
       });
 
-      it("should call UserModel.findByIdAndRemove", async function() {
-        expect(User.findByIdAndRemove).toHaveBeenCalledWith(req.params.id);
+      it("should call UserModel.findByIdAndDelete", async function() {
+        expect(User.findByIdAndDelete).toHaveBeenCalledWith(req.params.id);
       });
     });