diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 8787d77cd..1161ad5dc 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -115,17 +115,14 @@ class ModerationContainer extends Component { document: COMMENT_EDITED_SUBSCRIPTION, variables, updateQuery: (prev, {subscriptionData: {data: {commentEdited: comment}}}) => { - const notifyText = t('modqueue.notify_edited', comment.user.username, prepareNotificationText(comment.body)); - return this.handleCommentChange(prev, comment, notifyText); + return this.handleCommentChange(prev, comment); }, }, { document: COMMENT_FLAGGED_SUBSCRIPTION, variables, updateQuery: (prev, {subscriptionData: {data: {commentFlagged: comment}}}) => { - const user = comment.actions[comment.actions.length - 1].user; - const notifyText = t('modqueue.notify_flagged', user.username, prepareNotificationText(comment.body)); - return this.handleCommentChange(prev, comment, notifyText); + return this.handleCommentChange(prev, comment); }, }, ]; diff --git a/nightwatch-browserstack.conf.js b/nightwatch-browserstack.conf.js index 788bfe97f..604691c81 100644 --- a/nightwatch-browserstack.conf.js +++ b/nightwatch-browserstack.conf.js @@ -23,7 +23,9 @@ const nightwatch_config = { 'browserstack.key': process.env.BROWSERSTACK_KEY, 'browserstack.local': true, 'browserstack.debug': true, - 'browserstack.networkLogs': true, + + // Disable this, as it makes bs slow and brittle. + 'browserstack.networkLogs': false, } }, chrome: { @@ -49,8 +51,6 @@ const nightwatch_config = { ie: { desiredCapabilities: { browser: 'internet explorer', - - // Windows 10 + IE seems to have troubles with the browserstack-local tunnel (10.17.17). os: 'Windows', os_version: '8.1', browser_version: '11', diff --git a/plugins/talk-plugin-featured-comments/client/components/ModTag.js b/plugins/talk-plugin-featured-comments/client/components/ModTag.js index 7dfd36f2d..0664f07cd 100644 --- a/plugins/talk-plugin-featured-comments/client/components/ModTag.js +++ b/plugins/talk-plugin-featured-comments/client/components/ModTag.js @@ -32,7 +32,6 @@ export default class ModTag extends React.Component { postTag = async () => { try { await this.props.postTag(); - this.props.notify('success', t('talk-plugin-featured-comments.notify_self_featured', this.props.comment.user.username)); } catch(err) { this.props.notify('error', getErrorMessages(err)); diff --git a/scripts/e2e-ci.sh b/scripts/e2e-ci.sh index f1376abcb..1e4f45691 100755 --- a/scripts/e2e-ci.sh +++ b/scripts/e2e-ci.sh @@ -21,7 +21,9 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then # Test using browserstack. browserstack chrome browserstack firefox - browserstack ie + + # temporarily turn off ci, please fix https://www.pivotaltracker.com/story/show/152144406. + # browserstack ie # Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old. # browserstack safari