Merge branch 'master' of github.com:coralproject/talk into load-more-comments

test/e2e/pages/embedStreamPage.js

@@ -19,7 +19,7 @@ const embedStreamCommands = {
       .setValue('@signInDialogEmail', user.email)
       .setValue('@signInDialogPassword', user.pass)
       .setValue('@signUpDialogConfirmPassword', user.pass)
-      .setValue('@signUpDialogDisplayName', user.displayName)
+      .setValue('@signUpDialogDisplayName', user.username)
       .waitForElementVisible('@signUpButton')
       .click('@signUpButton')
       .waitForElementVisible('@signInViewTrigger')
@@ -96,7 +96,7 @@ module.exports = {
       selector: '#signInDialog #confirmPassword'
     },
     signUpDialogDisplayName: {
-      selector: '#signInDialog #displayName'
+      selector: '#signInDialog #username'
     },
     logInButton: {
       selector: '#coralLogInButton'

test/e2e/tests/EmbedStreamTests.js

@@ -37,7 +37,7 @@ module.exports = {
           .click('#coralRegister')
           .waitForElementVisible('#email', 1000)
           .setValue('#email', mockUser.email)
-          .setValue('#displayName', mockUser.name)
+          .setValue('#username', mockUser.name)
           .setValue('#password', mockUser.pw)
           .setValue('#confirmPassword', mockUser.pw)
           .click('#coralSignUpButton')
@@ -125,7 +125,7 @@ module.exports = {
 
       // Add a mock user
       .then(() => mocks.users([{
-        displayName: 'BabyBlue',
+        username: 'BabyBlue',
         email: 'whale@tale.sea',
         password: 'krillaretasty'
       }]))

test/e2e/tests/Visitor/SignUpTest.js

@@ -13,7 +13,7 @@ module.exports = {
     embedStreamPage
       .signUp({
         email: `visitor_${Date.now()}@test.com`,
-        displayName: `visitor${Date.now()}`,
+        username: `visitor${Date.now()}`,
         pass: 'testtest'
       });
   },