From f0dd8b96908dd1761bae72f9f627375060b7cdab Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Tue, 27 Feb 2018 16:15:20 -0700 Subject: [PATCH 1/9] added featured notifications --- .gitignore | 1 + docs/_docs/04-03-additional-plugins.md | 8 ++ .../client/.eslintrc.json | 3 + .../client/containers/Toggle.js | 69 ++++++++++ .../client/graphql.js | 33 +++++ .../client/index.js | 11 ++ .../client/translations.yml | 3 + .../index.js | 118 ++++++++++++++++++ .../translations.yml | 6 + .../.eslintrc.json | 3 - .../client/containers/Toggle.js | 2 +- .../translations.yml | 2 +- .../talk-plugin-notifications/.eslintrc.json | 3 - .../client/containers/Settings.js | 6 +- 14 files changed, 257 insertions(+), 11 deletions(-) create mode 100644 plugins/talk-plugin-notifications-category-featured/client/.eslintrc.json create mode 100644 plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js create mode 100644 plugins/talk-plugin-notifications-category-featured/client/graphql.js create mode 100644 plugins/talk-plugin-notifications-category-featured/client/index.js create mode 100644 plugins/talk-plugin-notifications-category-featured/client/translations.yml create mode 100644 plugins/talk-plugin-notifications-category-featured/index.js create mode 100644 plugins/talk-plugin-notifications-category-featured/translations.yml delete mode 100644 plugins/talk-plugin-notifications-category-reply/.eslintrc.json delete mode 100644 plugins/talk-plugin-notifications/.eslintrc.json diff --git a/.gitignore b/.gitignore index 11b6af551..45de961a8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ plugins/* !plugins/talk-plugin-mod !plugins/talk-plugin-moderation-actions !plugins/talk-plugin-notifications +!plugins/talk-plugin-notifications-category-featured !plugins/talk-plugin-notifications-category-reply !plugins/talk-plugin-offtopic !plugins/talk-plugin-permalink diff --git a/docs/_docs/04-03-additional-plugins.md b/docs/_docs/04-03-additional-plugins.md index 4f1654a4f..b88d8437c 100644 --- a/docs/_docs/04-03-additional-plugins.md +++ b/docs/_docs/04-03-additional-plugins.md @@ -149,3 +149,11 @@ Source: [plugins/talk-plugin-notifications-category-reply](https://github.com/co Replies made to each user will trigger an email to be sent with the notification details if enabled. + +### talk-plugin-notifications-category-featured +{:.param} + +Source: [plugins/talk-plugin-notifications-category-featured](https://github.com/coralproject/talk/tree/master/plugins/talk-plugin-notifications-category-featured){:target="_blank"} + +When a comment is featured (via the `talk-plugin-featured-comments` plugin), the +user will receive a notification email. diff --git a/plugins/talk-plugin-notifications-category-featured/client/.eslintrc.json b/plugins/talk-plugin-notifications-category-featured/client/.eslintrc.json new file mode 100644 index 000000000..c8a6db18a --- /dev/null +++ b/plugins/talk-plugin-notifications-category-featured/client/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "@coralproject/eslint-config-talk/client" +} diff --git a/plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js b/plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js new file mode 100644 index 000000000..d7c6f6a0b --- /dev/null +++ b/plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js @@ -0,0 +1,69 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { compose, gql } from 'react-apollo'; +import Toggle from 'talk-plugin-notifications/client/components/Toggle'; +import { t } from 'plugin-api/beta/client/services'; +import { withFragments } from 'plugin-api/beta/client/hocs'; + +class ToggleContainer extends React.Component { + constructor(props) { + super(props); + props.setTurnOffInputFragment({ onFeatured: false }); + + if (this.getOnFeaturedSetting()) { + props.indicateOn(); + } + } + + componentWillReceiveProps(nextProps) { + const prevSetting = this.getOnFeaturedSetting(this.props); + const nextSetting = this.getOnFeaturedSetting(nextProps); + if (prevSetting && !nextSetting) { + nextProps.indicateOff(); + } else if (!prevSetting && nextSetting) { + nextProps.indicateOn(); + } + } + + getOnFeaturedSetting = (props = this.props) => + props.root.me.notificationSettings.onFeatured; + + toggle = () => { + this.props.updateNotificationSettings({ + onFeatured: !this.getOnFeaturedSetting(), + }); + }; + + render() { + return ( + + {t('talk-plugin-notifications-category-reply.toggle_description')} + + ); + } +} + +ToggleContainer.propTypes = { + data: PropTypes.object, + root: PropTypes.object, + indicateOn: PropTypes.func.isRequired, + indicateOff: PropTypes.func.isRequired, + setTurnOffInputFragment: PropTypes.func.isRequired, + updateNotificationSettings: PropTypes.func.isRequired, +}; + +const enhance = compose( + withFragments({ + root: gql` + fragment TalkNotificationsCategoryFeatured_Toggle_root on RootQuery { + me { + notificationSettings { + onFeatured + } + } + } + `, + }) +); + +export default enhance(ToggleContainer); diff --git a/plugins/talk-plugin-notifications-category-featured/client/graphql.js b/plugins/talk-plugin-notifications-category-featured/client/graphql.js new file mode 100644 index 000000000..440a6f7fa --- /dev/null +++ b/plugins/talk-plugin-notifications-category-featured/client/graphql.js @@ -0,0 +1,33 @@ +import { gql } from 'react-apollo'; + +export default { + mutations: { + UpdateNotificationSettings: ({ + variables: { input }, + state: { auth: { user: { id } } }, + }) => ({ + update: proxy => { + if (input.onFeatured === undefined) { + return; + } + + const fragment = gql` + fragment TalkNotificationsCategoryFeatured_User_Fragment on User { + notificationSettings { + onFeatured + } + } + `; + const fragmentId = `User_${id}`; + const data = { + __typename: 'User', + notificationSettings: { + __typename: 'NotificationSettings', + onFeatured: input.onFeatured, + }, + }; + proxy.writeFragment({ fragment, id: fragmentId, data }); + }, + }), + }, +}; diff --git a/plugins/talk-plugin-notifications-category-featured/client/index.js b/plugins/talk-plugin-notifications-category-featured/client/index.js new file mode 100644 index 000000000..1e22c3a93 --- /dev/null +++ b/plugins/talk-plugin-notifications-category-featured/client/index.js @@ -0,0 +1,11 @@ +import Toggle from './containers/Toggle'; +import translations from './translations.yml'; +import graphql from './graphql'; + +export default { + slots: { + notificationSettings: [Toggle], + }, + translations, + ...graphql, +}; diff --git a/plugins/talk-plugin-notifications-category-featured/client/translations.yml b/plugins/talk-plugin-notifications-category-featured/client/translations.yml new file mode 100644 index 000000000..7077943ef --- /dev/null +++ b/plugins/talk-plugin-notifications-category-featured/client/translations.yml @@ -0,0 +1,3 @@ +en: + talk-plugin-notifications-category-featured: + toggle_description: My comment is featured diff --git a/plugins/talk-plugin-notifications-category-featured/index.js b/plugins/talk-plugin-notifications-category-featured/index.js new file mode 100644 index 000000000..802c37a9a --- /dev/null +++ b/plugins/talk-plugin-notifications-category-featured/index.js @@ -0,0 +1,118 @@ +const { graphql } = require('graphql'); +const { get } = require('lodash'); +const path = require('path'); + +const handle = async (ctx, { comment }) => { + const { connectors: { graph: { schema } } } = ctx; + + // Check to see if this is a reply to an existing comment. + const commentID = get(comment, 'id', null); + if (commentID === null) { + ctx.log.debug('could not get comment id'); + return; + } + + // Execute the graph request. + const reply = await graphql( + schema, + ` + query GetAuthorUserMetadata($comment_id: ID!) { + comment(id: $comment_id) { + id + user { + id + notificationSettings { + onFeatured + } + } + } + } + `, + {}, + ctx, + { comment_id: commentID } + ); + if (reply.errors) { + ctx.log.error({ err: reply.errors }, 'could not query for author metadata'); + return; + } + + // Check if the user has notifications enabled. + const enabled = get( + reply, + 'data.comment.user.notificationSettings.onFeatured', + false + ); + if (!enabled) { + return; + } + + const userID = get(reply, 'data.comment.user.id', null); + if (!userID) { + ctx.log.debug('could not get comment user id'); + return; + } + + // The user does have notifications for featured comments enabled, queue the + // notification to be sent. + return { userID, date: comment.created_at, context: comment.id }; +}; + +const hydrate = async (ctx, category, context) => { + const { connectors: { graph: { schema } } } = ctx; + + const reply = await graphql( + schema, + ` + query GetNotificationData($context: ID!) { + comment(id: $context) { + id + asset { + title + url + } + } + } + `, + {}, + ctx, + { context } + ); + if (reply.errors) { + throw reply.errors; + } + + const comment = get(reply, 'data.comment'); + const headline = get(comment, 'asset.title', null); + const assetURL = get(comment, 'asset.url', null); + const permalink = `${assetURL}?commentId=${comment.id}`; + + return [headline, permalink]; +}; + +const handler = { + handle, + category: 'featured', + event: 'commentFeatured', + hydrate, +}; + +module.exports = { + typeDefs: ` + type NotificationSettings { + onFeatured: Boolean! + } + + input NotificationSettingsInput { + onFeatured: Boolean + } + `, + resolvers: { + NotificationSettings: { + // onFeatured returns false by default if not specified. + onFeatured: settings => get(settings, 'onFeatured', false), + }, + }, + translations: path.join(__dirname, 'translations.yml'), + notifications: [handler], +}; diff --git a/plugins/talk-plugin-notifications-category-featured/translations.yml b/plugins/talk-plugin-notifications-category-featured/translations.yml new file mode 100644 index 000000000..bd0d7412f --- /dev/null +++ b/plugins/talk-plugin-notifications-category-featured/translations.yml @@ -0,0 +1,6 @@ +en: + talk-plugin-notifications: + categories: + featured: + subject: "One of your comments was featured on [{0}]" + body: "{0}\nA member of our team has selected this comment to be featured for other readers: {1}" \ No newline at end of file diff --git a/plugins/talk-plugin-notifications-category-reply/.eslintrc.json b/plugins/talk-plugin-notifications-category-reply/.eslintrc.json deleted file mode 100644 index 78f7c2397..000000000 --- a/plugins/talk-plugin-notifications-category-reply/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@coralproject/eslint-config-talk" -} diff --git a/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js b/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js index 61600a29f..2c9dd82e5 100644 --- a/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js +++ b/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js @@ -37,7 +37,7 @@ class ToggleContainer extends React.Component { render() { return ( - {t('talk-plugin-notifications-category-reply.toggle_description')} + {t('talk-plugin-notifications-category-featured.toggle_description')} ); } diff --git a/plugins/talk-plugin-notifications-category-reply/translations.yml b/plugins/talk-plugin-notifications-category-reply/translations.yml index b3421a1a3..2599f8b59 100644 --- a/plugins/talk-plugin-notifications-category-reply/translations.yml +++ b/plugins/talk-plugin-notifications-category-reply/translations.yml @@ -2,5 +2,5 @@ en: talk-plugin-notifications: categories: reply: - subject: "Some has replied to your comment on [{0}]" + subject: "Someone has replied to your comment on [{0}]" body: "{0}\n{1} replied to your comment: {2}" \ No newline at end of file diff --git a/plugins/talk-plugin-notifications/.eslintrc.json b/plugins/talk-plugin-notifications/.eslintrc.json deleted file mode 100644 index 78f7c2397..000000000 --- a/plugins/talk-plugin-notifications/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@coralproject/eslint-config-talk" -} diff --git a/plugins/talk-plugin-notifications/client/containers/Settings.js b/plugins/talk-plugin-notifications/client/containers/Settings.js index ff07c6433..e987bafa2 100644 --- a/plugins/talk-plugin-notifications/client/containers/Settings.js +++ b/plugins/talk-plugin-notifications/client/containers/Settings.js @@ -23,9 +23,9 @@ class SettingsContainer extends React.Component { hasNotifications: this.state.hasNotifications.filter(i => i !== plugin), }); setTurnOffInputFragment = fragment => - this.setState({ - turnOffInput: { ...this.state.turnOffInput, ...fragment }, - }); + this.setState(state => ({ + turnOffInput: { ...state.turnOffInput, ...fragment }, + })); turnOffAll = () => { this.props.updateNotificationSettings(this.state.turnOffInput); From 7ccb1e26a4ca077164eda8806a14cbedb113b25a Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 13:26:08 -0700 Subject: [PATCH 2/9] fixed translation --- .../client/containers/Toggle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js b/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js index 2c9dd82e5..61600a29f 100644 --- a/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js +++ b/plugins/talk-plugin-notifications-category-reply/client/containers/Toggle.js @@ -37,7 +37,7 @@ class ToggleContainer extends React.Component { render() { return ( - {t('talk-plugin-notifications-category-featured.toggle_description')} + {t('talk-plugin-notifications-category-reply.toggle_description')} ); } From 1a7f7dddd4b652cfd581d8815da59595d2c63f5d Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 13:26:35 -0700 Subject: [PATCH 3/9] more fixes to translation --- .../client/containers/Toggle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js b/plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js index d7c6f6a0b..ec7586b16 100644 --- a/plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js +++ b/plugins/talk-plugin-notifications-category-featured/client/containers/Toggle.js @@ -37,7 +37,7 @@ class ToggleContainer extends React.Component { render() { return ( - {t('talk-plugin-notifications-category-reply.toggle_description')} + {t('talk-plugin-notifications-category-featured.toggle_description')} ); } From 744348dee5249c1c66b2574b09110e1299f74253 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 13:50:36 -0700 Subject: [PATCH 4/9] seperated tests --- .circleci/config.yml | 13 +++++++++---- package.json | 1 + yarn.lock | 8 +++++++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d280fda2c..944247997 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,13 +104,18 @@ jobs: name: Setup the test results directory command: mkdir -p /tmp/circleci-test-results - run: - name: Run the unit tests - command: yarn test + name: Run the client unit tests + command: yarn test:client --ci --testResultsProcessor="./node_modules/jest-junit-reporter environment: - MOCHA_FILE: /tmp/circleci-test-results/junit/test-results.xml + TEST_REPORT_PATH: /tmp/circleci-test-results/jest/test-results.xml + - run: + name: Run the server unit tests + command: yarn test:server + environment: + MOCHA_FILE: /tmp/circleci-test-results/mocha/test-results.xml MOCHA_REPORTER: mocha-junit-reporter - NODE_ENV: test - store_test_results: + when: always path: /tmp/circleci-test-results # test_integration_chrome_local will run the integration tests locally with diff --git a/package.json b/package.json index 9c5f58ff5..b443d540a 100644 --- a/package.json +++ b/package.json @@ -216,6 +216,7 @@ "identity-obj-proxy": "^3.0.0", "ip": "^1.1.5", "jest": "^21.2.1", + "jest-junit-reporter": "^1.1.0", "lint-staged": "^7.0.0", "mocha": "^3.1.2", "mocha-junit-reporter": "^1.12.1", diff --git a/yarn.lock b/yarn.lock index 62eb054fb..947eb7f80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5399,6 +5399,12 @@ jest-jasmine2@^22.4.2: jest-util "^22.4.1" source-map-support "^0.5.0" +jest-junit-reporter@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/jest-junit-reporter/-/jest-junit-reporter-1.1.0.tgz#88d6006ec13f82df40c47882c8640989cdcb1434" + dependencies: + xml "^1.0.1" + jest-matcher-utils@^21.2.1: version "21.2.1" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.2.1.tgz#72c826eaba41a093ac2b4565f865eb8475de0f64" @@ -10987,7 +10993,7 @@ xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" -xml@^1.0.0: +xml@^1.0.0, xml@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" From 2451d4b6d6e217d80219a01978661c128ce5f5f0 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 14:00:56 -0700 Subject: [PATCH 5/9] adjusted client tests --- .circleci/config.yml | 5 +++-- jest.config.js | 2 ++ package.json | 2 +- yarn.lock | 8 +++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 944247997..25623bd48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,9 +105,10 @@ jobs: command: mkdir -p /tmp/circleci-test-results - run: name: Run the client unit tests - command: yarn test:client --ci --testResultsProcessor="./node_modules/jest-junit-reporter + command: yarn test:client --ci environment: - TEST_REPORT_PATH: /tmp/circleci-test-results/jest/test-results.xml + JEST_JUNIT_OUTPUT: /tmp/circleci-test-results/jest/test-results.xml + JEST_REPORTER: jest-junit - run: name: Run the server unit tests command: yarn test:server diff --git a/jest.config.js b/jest.config.js index 654b72cd0..7150d1066 100644 --- a/jest.config.js +++ b/jest.config.js @@ -27,6 +27,8 @@ module.exports = { '\\.ya?ml$': '/test/client/yamlTransformer.js', }, + testResultsProcessor: process.env.JEST_REPORTER, + moduleNameMapper: { '^plugin-api\\/(.*)$': '/plugin-api/$1', '^plugins\\/(.*)$': '/plugins/$1', diff --git a/package.json b/package.json index b443d540a..e54ad11d4 100644 --- a/package.json +++ b/package.json @@ -216,7 +216,7 @@ "identity-obj-proxy": "^3.0.0", "ip": "^1.1.5", "jest": "^21.2.1", - "jest-junit-reporter": "^1.1.0", + "jest-junit": "^3.6.0", "lint-staged": "^7.0.0", "mocha": "^3.1.2", "mocha-junit-reporter": "^1.12.1", diff --git a/yarn.lock b/yarn.lock index 947eb7f80..5153185a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5399,10 +5399,12 @@ jest-jasmine2@^22.4.2: jest-util "^22.4.1" source-map-support "^0.5.0" -jest-junit-reporter@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/jest-junit-reporter/-/jest-junit-reporter-1.1.0.tgz#88d6006ec13f82df40c47882c8640989cdcb1434" +jest-junit@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/jest-junit/-/jest-junit-3.6.0.tgz#f4c4358e5286364a4324dc14abddd526aadfbd38" dependencies: + mkdirp "^0.5.1" + strip-ansi "^4.0.0" xml "^1.0.1" jest-matcher-utils@^21.2.1: From bd93d2d5b56e2cfe7e16aa22b46567e80d54e164 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 15:54:26 -0700 Subject: [PATCH 6/9] fixed workspace error --- bin/cli-plugins | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/cli-plugins b/bin/cli-plugins index ee331bff2..f2e76de21 100755 --- a/bin/cli-plugins +++ b/bin/cli-plugins @@ -143,7 +143,7 @@ async function reconcileRemotePlugins({ dryRun, upgradeRemote }) { if (fetchable.length > 0) { console.log( - `$ yarn add --ignore-scripts ${fetchable.map( + `$ yarn add --ignore-scripts --ignore-workspace-root-check ${fetchable.map( ({ name, version }) => `${name}@${version}`.cyan )}` ); @@ -152,6 +152,7 @@ async function reconcileRemotePlugins({ dryRun, upgradeRemote }) { let args = [ 'add', '--ignore-scripts', + '--ignore-workspace-root-check', ...fetchable.map(({ name, version }) => `${name}@${version}`), ]; From 6426d3ebd8acbb3119a82403b9fb208d327d75cf Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 17:18:29 -0700 Subject: [PATCH 7/9] always save test results --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 25623bd48..2bfb2980d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,7 @@ integration_job: &integration_job name: Run the integration tests command: bash .circleci/e2e.sh - store_test_results: + when: always path: /tmp/circleci-test-results version: 2 From de54b916efbe0e45f677c5a9ae786d023f4779f1 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 17:22:38 -0700 Subject: [PATCH 8/9] changed max retries on unreliable tests --- .circleci/config.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2bfb2980d..6818e463d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,7 @@ job_defaults: &job_defaults integration_environment: &integration_environment NODE_ENV: test CIRCLE_TEST_REPORTS: /tmp/circleci-test-results + E2E_MAX_RETRIES: 3 # integration_job runs the integration tests and saves the test results. integration_job: &integration_job @@ -171,6 +172,8 @@ jobs: <<: *integration_environment BROWSERSTACK: true E2E_BROWSERS: ie + # TODO: remove when more reliable + E2E_MAX_RETRIES: 1 # test_integration_safari will run the integration tests with safari in # browserstack. @@ -180,6 +183,8 @@ jobs: <<: *integration_environment BROWSERSTACK: true E2E_BROWSERS: safari + # TODO: remove when more reliable + E2E_MAX_RETRIES: 1 # deploy will deploy the application as a docker image. deploy: @@ -281,4 +286,7 @@ workflows: - test_unit - test_integration_chrome - test_integration_firefox - - test_integration_edge \ No newline at end of file + - test_integration_edge + # TODO: uncomment when more reliable + # - test_integration_ie + # - test_integration_safari \ No newline at end of file From 8cb75e3bb1b6c3d8987da41b7bc112df95127a79 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 28 Feb 2018 17:31:52 -0700 Subject: [PATCH 9/9] fixed deploy --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6818e463d..9e1ee91e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -194,7 +194,7 @@ jobs: - setup_remote_docker - run: name: Deploy the code - command: bash ./scripts/docker.sh + command: bash ./scripts/docker.sh deploy # filter_deploy will add the filters for a deploy job in a workflow to make it # only execute on a deploy related job.