Merge branch 'unique-user-check' into 'master'

Fix typo in user unique check

See merge request !128

src/models/User.js

@@ -51,7 +51,7 @@ class User extends Model {
       throw new ConflictError('User already exists')
     }
 
-    result = await User.findByUsername(user.email).catch(swallowNotFound)
+    result = await User.findByUsername(user.username).catch(swallowNotFound)
 
     if (result) {
       throw new ConflictError('User already exists')

test/user_test.js

@@ -21,9 +21,28 @@ describe('User', function () {
     expect(shouldBeInvalid).toEqual(false)
   })
 
-  it('raises an error if trying to save a non-unique user', async () => {
+  it('raises an error if trying to save a user with a non-unique username', async () => {
     const user = new User(userFixture)
-    const duplicateUser = new User(userFixture)
+    const otherUserFixture = fixtures.otherUser
+    otherUserFixture.username = userFixture.username
+    const duplicateUser = new User(otherUserFixture)
+
+    await user.save()
+
+    try {
+      await duplicateUser.save()
+    } catch (err) {
+      expect(err.name).toEqual('ConflictError')
+    }
+
+    expect.hasAssertions()
+  })
+
+  it('raises an error if trying to save a user with a non-unique email', async () => {
+    const user = new User(userFixture)
+    const otherUserFixture = fixtures.otherUser
+    otherUserFixture.email = userFixture.email
+    const duplicateUser = new User(otherUserFixture)
 
     await user.save()