From c8ab5cdbf62e7cc9a650779cf9d1c56f903ec055 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 21 Dec 2017 12:43:26 -0700
Subject: [PATCH] fixed tests

---
 errors.js                     |  7 -------
 services/users.js             |  2 +-
 test/server/services/users.js | 17 +----------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/errors.js b/errors.js
index 86953ee02..a87d234e8 100644
--- a/errors.js
+++ b/errors.js
@@ -165,12 +165,6 @@ const ErrPermissionUpdateUsername = new APIError('You do not have permission to
   status: 403
 });
 
-// ErrSameUsernameProvided is returned when attempting to update a username to the same username.
-const ErrSameUsernameProvided = new APIError('Same username provided.', {
-  translation_key: 'SAME_USERNAME_PROVIDED',
-  status: 400
-});
-
 // ErrLoginAttemptMaximumExceeded is returned when the login maximum is exceeded.
 const ErrLoginAttemptMaximumExceeded = new APIError('You have made too many incorrect password attempts.', {
   translation_key: 'LOGIN_MAXIMUM_EXCEEDED',
@@ -238,7 +232,6 @@ module.exports = {
   ErrNotVerified,
   ErrPasswordTooShort,
   ErrPermissionUpdateUsername,
-  ErrSameUsernameProvided,
   ErrSettingsInit,
   ErrSettingsNotInit,
   ErrSpecialChars,
diff --git a/services/users.js b/services/users.js
index c2307727f..3d70eeafd 100644
--- a/services/users.js
+++ b/services/users.js
@@ -282,7 +282,7 @@ class UsersService {
         }
 
         if (!resetAllowed && user.username === username) {
-          throw errors.ErrSameUsernameProvided;
+          throw errors.ErrUsernameTaken;
         }
 
         throw new Error('edit username failed for an unexpected reason');
diff --git a/test/server/services/users.js b/test/server/services/users.js
index d137f0d57..63435766d 100644
--- a/test/server/services/users.js
+++ b/test/server/services/users.js
@@ -278,27 +278,12 @@ describe('services.UsersService', () => {
             await UsersService[func](user.id, user.username);
             throw new Error('edit was processed successfully');
           } catch (err) {
-            expect(err).have.property('translation_key', 'SAME_USERNAME_PROVIDED');
+            expect(err).have.property('translation_key', 'USERNAME_IN_USE');
           }
         } else {
           await UsersService[func](user.id, user.username);
         }
       });
-
-      it('should refuse changing the username to one already taken', async () => {
-        const user = mockUsers[0];
-        const otherUser = mockUsers[1];
-
-        // Set the user to the desired status.
-        await UsersService.setUsernameStatus(user.id, okStatus);
-
-        try {
-          await UsersService[func](user.id, otherUser.username);
-          throw new Error('edit was processed successfully');
-        } catch (err) {
-          expect(err).have.property('translation_key', 'USERNAME_IN_USE');
-        }
-      });
     });
   });