Merge branch 'master' into gdpr-email

client/coral-embed-stream/src/tabs/stream/components/Comment.js

@@ -574,7 +574,9 @@ export default class Comment extends React.Component {
                   'talk-stream-comment-header-tags-container'
                 )}
               >
-                {isStaff(comment.tags) ? <TagLabel>Staff</TagLabel> : null}
+                {isStaff(comment.tags) ? (
+                  <TagLabel>{t('community.staff')}</TagLabel>
+                ) : null}
 
                 <Slot
                   className={cn(

package.json

@@ -79,6 +79,7 @@
     "babel-polyfill": "^6.26.0",
     "babel-preset-es2015": "6.24.1",
     "babel-preset-react": "^6.23.0",
+    "bunyan-debug-stream": "^1.0.8",
     "bcryptjs": "^2.4.3",
     "bowser": "^1.7.2",
     "brotli-webpack-plugin": "^0.5.0",
@@ -218,7 +219,6 @@
     "babel-plugin-dynamic-import-node": "^1.1.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "browserstack-local": "^1.3.0",
-    "bunyan-debug-stream": "^1.0.8",
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
     "chai-datetime": "^1.5.0",

services/logging.js

@@ -2,13 +2,13 @@ const { version } = require('../package.json');
 const path = require('path');
 const { createLogger: createBunyanLogger, stdSerializers } = require('bunyan');
 const { LOGGING_LEVEL, REVISION_HASH } = require('../config');
+const debug = require('bunyan-debug-stream');
 
 // Streams enables the ability for development logs to be readable to a human,
 // but will send JSON logs in production that's parsable by a system like ELK.
 const streams = (() => {
   // In development, use the debug stream printer.
   if (process.env.NODE_ENV !== 'production') {
-    const debug = require('bunyan-debug-stream');
     return [
       {
         level: LOGGING_LEVEL,

test/e2e/globals.js

@@ -27,6 +27,6 @@ module.exports = {
       body: 'This is a test comment',
     },
     organizationName: 'Coral',
-    organizationContactEmail: 'coral@coraltest.coral',
+    organizationContactEmail: 'coral@coralproject.net',
   },
 };

test/e2e/page_objects/install.js

@@ -20,6 +20,8 @@ module.exports = {
       selector: '.talk-install-step-2',
       elements: {
         organizationNameInput: '.talk-install-step-2 #organizationName',
+        organizationContactEmailInput:
+          '.talk-install-step-2 #organizationContactEmail',
         saveButton: '.talk-install-step-2-save-button',
       },
     },

test/e2e/specs/01_install.js

@@ -38,7 +38,12 @@ module.exports = {
 
     step2
       .waitForElementVisible('@organizationNameInput')
+      .waitForElementVisible('@organizationContactEmailInput', 5000)
       .setValue('@organizationNameInput', testData.organizationName)
+      .setValue(
+        '@organizationContactEmailInput',
+        testData.organizationContactEmail
+      )
       .waitForElementVisible('@saveButton')
       .click('@saveButton');
   },