From 43fa0d2b58712569a960ddab3665410ef88feba7 Mon Sep 17 00:00:00 2001 From: Tibo Beijen Date: Thu, 19 Apr 2018 10:43:41 +0200 Subject: [PATCH 1/3] Added translation to staff label in comment stream. --- .../coral-embed-stream/src/tabs/stream/components/Comment.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js index 5df119fbc..0983b11c4 100644 --- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js +++ b/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) ? Staff : null} + {isStaff(comment.tags) ? ( + {t('community.staff')} + ) : null} Date: Fri, 20 Apr 2018 10:52:03 -0600 Subject: [PATCH 2/3] fix for logger --- package.json | 2 +- services/logging.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 845e2b11a..c7e9a78c1 100644 --- a/package.json +++ b/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", diff --git a/services/logging.js b/services/logging.js index 7ae3654b1..850283f40 100644 --- a/services/logging.js +++ b/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, From 80f219513b497e7e2b15757cb3529afe595eb097 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Fri, 20 Apr 2018 11:39:22 -0600 Subject: [PATCH 3/3] fixed e2e --- test/e2e/globals.js | 2 +- test/e2e/page_objects/install.js | 2 ++ test/e2e/specs/01_install.js | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/e2e/globals.js b/test/e2e/globals.js index 371fe64c5..aeecd204e 100644 --- a/test/e2e/globals.js +++ b/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', }, }; diff --git a/test/e2e/page_objects/install.js b/test/e2e/page_objects/install.js index 26b024993..1f27eabd7 100644 --- a/test/e2e/page_objects/install.js +++ b/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', }, }, diff --git a/test/e2e/specs/01_install.js b/test/e2e/specs/01_install.js index a8a88566c..75e6a60eb 100644 --- a/test/e2e/specs/01_install.js +++ b/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'); },