Merge branch 'master' into status-history

tests/e2e/globals.js

@@ -0,0 +1,4 @@
+module.exports = {
+  waitForConditionTimeout: 20000,
+  baseUrl: 'localhost:3011/'
+};

tests/e2e/mocks.js

@@ -0,0 +1,25 @@
+const Comments = require('../../models/comment');
+const Users = require('../../models/user');
+const Actions = require('../../models/action');
+const Assets = require('../../models/asset');
+const Settings = require('../../models/setting');
+const globals = require('./globals');
+
+/* Create an array of comments */
+module.exports.comments = (comments) => Assets.findOrCreateByUrl(globals.baseUrl)
+  .then((asset) => {
+    comments = comments.map((comment) => {
+      comment.asset_id = asset.id;
+      return comment;
+    });
+    return Comments.create(comments);
+  });
+
+/* Create an array of users */
+module.exports.users = (users) => Users.createLocalUsers(users);
+
+/* Create an array of actions */
+module.exports.actions = (actions) => Actions.create(actions);
+
+/* Update a setting */
+module.exports.settings = (setting) => Settings.init().then(() => Settings.updateSettings(setting));

tests/e2e/pages/embedStream.js

@@ -0,0 +1,45 @@
+const fetch = require('node-fetch');
+
+const embedCommands = {
+  ready() {
+    return this.resizeWindow(1200, 800)
+      .url(client.globals.baseUrl)
+      .waitForElementVisible('body', 2000)
+      .frame('coralStreamIframe');
+  },
+  setConfig(config, baseUrl) {
+    return fetch(`${baseUrl}/api/v1/settings`, {
+      method: 'PUT',
+      headers: {
+        'Content-Type': 'application/json',
+        'Accept': 'application/json'
+      },
+      body: JSON.stringify(config)
+    });
+  },
+  enterComment() {
+    const comment = 'This is a test comment';
+    return this
+      .waitForElementVisible('@commentBox')
+      .setValue('@commentBox', comment)
+      .click('@postButton')
+      .waitForElementVisible('.comment', 1000);
+  },
+  validateComment(comment) {
+    return this
+      .assert.equal(comment, '.comment');
+  }
+};
+
+module.exports = {
+  commands: [embedCommands],
+  elements: {
+
+    commentBox: {
+      selector: '#commentBox'
+    },
+    postButton: {
+      selector: '#commentBox .coral-plugin-commentbox-button'
+    }
+  }
+};

tests/e2e/tests/AppTest.js

@@ -0,0 +1,13 @@
+module.exports = {
+  '@tags': ['app'],
+  'Base url and Hostname': browser => {
+    const {baseUrl} = browser.globals;
+    browser
+      .url(baseUrl)
+      .assert.title('Coral Talk')
+      .waitForElementPresent('body', 1000);
+  },
+  after: client => {
+    client.end();
+  }
+};

tests/e2e/tests/EmbedStreamTests.js

@@ -0,0 +1,173 @@
+const utils = require('../../utils/e2e-mongoose');
+const mocks = require('../mocks');
+
+const mockComment = 'This is a test comment.';
+const mockReply = 'This is a test reply';
+const mockUser = {
+  email: `${new Date().getTime()}@test.com`,
+  name: 'Test User',
+  pw: 'testtesttest'
+};
+
+module.exports = {
+  '@tags': ['embed-stream', 'comment', 'premodoff', 'premodon'],
+  before: () => {
+    utils.before();
+  },
+  'User registers and posts a comment with premod off': client => {
+    client.perform((client, done) => {
+      mocks.settings({moderation: 'post'})
+      .then(() => {
+        //Load Page
+        client.resizeWindow(1200, 800)
+          .url(client.globals.baseUrl)
+          .frame('coralStreamIframe')
+
+          //Register and Log In
+          .waitForElementVisible('#commentBox', 1000)
+          .waitForElementVisible('#coralSignInButton', 2000)
+          .click('#coralSignInButton')
+          .waitForElementVisible('#coralRegister', 1000)
+          .click('#coralRegister')
+          .waitForElementVisible('#email', 1000)
+          .setValue('#email', mockUser.email)
+          .setValue('#displayName', mockUser.name)
+          .setValue('#password', mockUser.pw)
+          .setValue('#confirmPassword', mockUser.pw)
+          .click('#coralSignUpButton')
+          .waitForElementVisible('#coralLogInButton', 10000)
+          .click('#coralLogInButton')
+          .waitForElementVisible('.coral-plugin-commentbox-button', 4000)
+
+          // Post a comment
+          .setValue('.coral-plugin-commentbox-textarea', mockComment)
+          .click('.coral-plugin-commentbox-button')
+          .waitForElementVisible('.comment', 1000)
+
+          //Verify that it appears
+          .assert.containsText('.comment', mockComment);
+        done();
+      })
+      .catch((err) => {
+        console.log(err);
+        done();
+      });
+    });
+  },
+  'User posts a comment with premod on': client => {
+    client.perform((client, done) => {
+      mocks.settings({moderation: 'pre'})
+      .then(() => {
+        //Load Page
+        client.url(client.globals.baseUrl)
+          .frame('coralStreamIframe');
+
+          // Post a comment
+        client.waitForElementVisible('.coral-plugin-commentbox-button', 2000)
+          .setValue('.coral-plugin-commentbox-textarea', mockComment)
+          .click('.coral-plugin-commentbox-button')
+          .waitForElementVisible('#coral-notif', 1000)
+
+          //Verify that it appears
+          .assert.containsText('#coral-notif', 'moderation team');
+        done();
+      })
+      .catch((err) => {
+        console.log(err);
+        done();
+      });
+    });
+  },
+  'User replies to a comment with premod off': client => {
+    client.perform((client, done) => {
+      mocks.settings({moderation: 'post'})
+      .then(() => {
+        //Load Page
+        client.resizeWindow(1200, 800)
+          .url(client.globals.baseUrl)
+          .frame('coralStreamIframe');
+
+          // Post a comment
+        client.waitForElementVisible('.coral-plugin-commentbox-button', 2000)
+          .setValue('.coral-plugin-commentbox-textarea', mockComment)
+          .click('.coral-plugin-commentbox-button')
+
+          // Post a reply
+          .waitForElementVisible('.coral-plugin-replies-reply-button', 5000)
+          .click('.coral-plugin-replies-reply-button')
+          .waitForElementVisible('#replyText')
+          .setValue('#replyText', mockReply)
+          .click('.coral-plugin-replies-textarea button')
+          .waitForElementVisible('.reply', 2000)
+
+          //Verify that it appears
+          .assert.containsText('.reply', mockReply);
+        done();
+      })
+      .catch((err) => {
+        console.log(err);
+        done();
+      });
+    });
+  },
+  'User replies to a comment with premod on': client => {
+    client.perform((client, done) => {
+      mocks.settings({moderation: 'pre'})
+
+      // Add a mock user
+      .then(() => {
+        return mocks.users([{
+          displayName: 'Baby Blue',
+          email: 'whale@tale.sea',
+          password: 'krill'
+        }]);
+      })
+
+      // Add a mock preapproved comment by that user
+      .then((user) => {
+        return mocks.comments([{
+          body: 'Whales are not fish.',
+          status: 'accepted',
+          author_id: user.id
+        }]);
+      })
+      .then(() => {
+        //Load Page
+        client.resizeWindow(1200, 800)
+          .url(client.globals.baseUrl)
+          .frame('coralStreamIframe');
+
+          // Post a reply
+        client.waitForElementVisible('.coral-plugin-replies-reply-button', 5000)
+          .click('.coral-plugin-replies-reply-button')
+          .waitForElementVisible('#replyText')
+          .setValue('#replyText', mockReply)
+          .click('.coral-plugin-replies-textarea button')
+          .waitForElementVisible('#coral-notif', 1000)
+
+          //Verify that it appears
+          .assert.containsText('#coral-notif', 'moderation team');
+        done();
+      })
+      .catch((err) => {
+        console.log(err);
+        done();
+      });
+    });
+  },
+  'Total comment count premod on': client => {
+    client.perform((client, done) => {
+      client.url(client.globals.baseUrl)
+        .frame('coralStreamIframe');
+
+        // Verify that comment count is correct
+      client.waitForElementVisible('.coral-plugin-comment-count-text', 2000)
+        .assert.containsText('.coral-plugin-comment-count-text', '1 Comment');
+      done();
+    });
+  },
+  after: client => {
+    utils.after();
+    client.end();
+  }
+};

tests/utils/e2e-mongoose.js

@@ -0,0 +1,34 @@
+const mongoose = require('../../mongoose');
+
+// Ensure the NODE_ENV is set to 'test',
+// this is helpful when you would like to change behavior when testing.
+function clearDB() {
+  // console.log('Clearing DB', mongoose.connection);
+  for (let i in mongoose.connection.collections) {
+    // console.log('Clearing', i);
+    mongoose.connection.collections[i].remove(function() {});
+  }
+}
+
+module.exports = {
+  before: () => {
+    clearDB();
+  },
+  beforeEach: () => {
+    if (mongoose.connection.readyState === 0) {
+      mongoose.on('open', function() {
+        if (err) {
+          throw err;
+        }
+
+        return clearDB();
+      });
+    } else {
+      return clearDB();
+    }
+  },
+  after: () => {
+    clearDB();
+    mongoose.disconnect();
+  }
+};