From 5dca1611bcbe182b09064fda3e9eb2992c61c631 Mon Sep 17 00:00:00 2001
From: David Jay <davidgljay@gmail.com>
Date: Wed, 1 Feb 2017 15:58:07 -0500
Subject: [PATCH] Moving account endpoint tests to account.

---
 test/routes/api/account/index.js | 71 ++++++++++++++++++++++++++++++++
 test/routes/api/user/index.js    | 57 -------------------------
 2 files changed, 71 insertions(+), 57 deletions(-)
 create mode 100644 test/routes/api/account/index.js

diff --git a/test/routes/api/account/index.js b/test/routes/api/account/index.js
new file mode 100644
index 000000000..5b9acfa9d
--- /dev/null
+++ b/test/routes/api/account/index.js
@@ -0,0 +1,71 @@
+const passport = require('../../../passport');
+
+const app = require('../../../../app');
+const chai = require('chai');
+const expect = chai.expect;
+
+const SettingsService = require('../../../../services/settings');
+const settings = {id: '1', moderation: 'PRE', wordlist: {banned: ['bad words'], suspect: ['suspect words']}};
+
+// Setup chai.
+chai.should();
+chai.use(require('chai-http'));
+
+const UsersService = require('../../../../services/users');
+
+describe('/api/v1/account/displayname', () => {
+  let mockUser;
+
+  beforeEach(() => SettingsService.init(settings).then(() => {
+    return UsersService.createLocalUser('ana@gmail.com', '123321123', 'Ana');
+  })
+  .then((user) => {
+    mockUser = user;
+  }));
+
+  describe('#put', () => {
+    it('it should enable a user to edit their username if canEditName is enabled', () => {
+      return chai.request(app)
+        .post(`/api/v1/users/${mockUser.id}/username-enable`)
+        .set(passport.inject({id: '456', roles: ['ADMIN']}))
+        .then(() => chai.request(app)
+          .put('/api/v1/account/displayname')
+          .set(passport.inject({id: mockUser.id, roles: []}))
+          .send({displayName: 'MojoJojo'}))
+        .then((res) => {
+          expect(res).to.have.status(204);
+        });
+    });
+
+    it('it should return an error if the wrong user tries to edit a username', (done) => {
+      chai.request(app)
+        .post(`/api/v1/users/${mockUser.id}/username-enable`)
+        .set(passport.inject({id: '456', roles: ['ADMIN']}))
+        .then(() => chai.request(app)
+          .put('/api/v1/account/displayname')
+          .set(passport.inject({id: 'wrongid', roles: []}))
+          .send({displayName: 'MojoJojo'}))
+        .then(() => {
+          done(new Error('Exected Error'));
+        })
+        .catch((err) => {
+          expect(err).to.be.truthy;
+          done();
+        });
+    });
+
+    it('it should return an error when the user tries to edit their username if canEditName is disabled', (done) => {
+      chai.request(app)
+        .put('/api/v1/account/displayname')
+        .set(passport.inject({id: mockUser.id, roles: []}))
+        .send({username: 'MojoJojo'})
+        .then(() => {
+          done(new Error('Exected Error'));
+        })
+        .catch((err) => {
+          expect(err).to.be.truthy;
+          done();
+        });
+    });
+  });
+});
diff --git a/test/routes/api/user/index.js b/test/routes/api/user/index.js
index 2fdf937b5..4de799df6 100644
--- a/test/routes/api/user/index.js
+++ b/test/routes/api/user/index.js
@@ -105,60 +105,3 @@ describe('/api/v1/users/:user_id/username-enable', () => {
     });
   });
 });
-
-describe('/api/v1/account/displayname', () => {
-  let mockUser;
-
-  beforeEach(() => SettingsService.init(settings).then(() => {
-    return UsersService.createLocalUser('ana@gmail.com', '123321123', 'Ana');
-  })
-  .then((user) => {
-    mockUser = user;
-  }));
-
-  describe('#post', () => {
-    it('it should enable a user to edit their username if canEditName is enabled', () => {
-      return chai.request(app)
-        .post(`/api/v1/users/${mockUser.id}/username-enable`)
-        .set(passport.inject({id: '456', roles: ['ADMIN']}))
-        .then(() => chai.request(app)
-          .put('/api/v1/account/displayname')
-          .set(passport.inject({id: mockUser.id, roles: []}))
-          .send({displayName: 'MojoJojo'}))
-        .then((res) => {
-          expect(res).to.have.status(204);
-        });
-    });
-
-    it('it should return an error if the wrong user tries to edit a username', (done) => {
-      chai.request(app)
-        .post(`/api/v1/users/${mockUser.id}/username-enable`)
-        .set(passport.inject({id: '456', roles: ['ADMIN']}))
-        .then(() => chai.request(app)
-          .put('/api/v1/account/displayname')
-          .set(passport.inject({id: 'wrongid', roles: []}))
-          .send({displayName: 'MojoJojo'}))
-        .then(() => {
-          done(new Error('Exected Error'));
-        })
-        .catch((err) => {
-          expect(err).to.be.truthy;
-          done();
-        });
-    });
-
-    it('it should return an error when the user tries to edit their username if canEditName is disabled', (done) => {
-      chai.request(app)
-        .put('/api/v1/account/displayname')
-        .set(passport.inject({id: mockUser.id, roles: []}))
-        .send({username: 'MojoJojo'})
-        .then(() => {
-          done(new Error('Exected Error'));
-        })
-        .catch((err) => {
-          expect(err).to.be.truthy;
-          done();
-        });
-    });
-  });
-});