{isConfirmed ? (
diff --git a/src/components/modal/social/presentation.jsx b/src/components/modal/social/presentation.jsx
index b628fd0da..ebbe485fe 100644
--- a/src/components/modal/social/presentation.jsx
+++ b/src/components/modal/social/presentation.jsx
@@ -6,6 +6,8 @@ const classNames = require('classnames');
const Modal = require('../base/modal.jsx');
const ModalTitle = require('../base/modal-title.jsx');
+const ModalInnerContent = require('../base/modal-inner-content.jsx');
+
const FlexRow = require('../../flex-row/flex-row.jsx');
require('../../forms/button.scss');
@@ -37,7 +39,7 @@ const SocialModalPresentation = ({
-
+
{/* top row: link */}
@@ -111,7 +113,7 @@ const SocialModalPresentation = ({
-
+
);
};
diff --git a/src/redux/preview.js b/src/redux/preview.js
index 84e5e3c9a..7239eba47 100644
--- a/src/redux/preview.js
+++ b/src/redux/preview.js
@@ -1,6 +1,6 @@
const defaults = require('lodash.defaults');
const keyMirror = require('keymirror');
-const async = require('async');
+const eachLimit = require('async/eachLimit');
const mergeWith = require('lodash.mergewith');
const uniqBy = require('lodash.uniqby');
@@ -524,7 +524,7 @@ module.exports.getCommentById = (projectId, commentId, ownerUsername, isAdmin, t
module.exports.getReplies = (projectId, commentIds, offset, ownerUsername, isAdmin, token) => (dispatch => {
dispatch(module.exports.setFetchStatus('replies', module.exports.Status.FETCHING));
const fetchedReplies = {};
- async.eachLimit(commentIds, 10, (parentId, callback) => {
+ eachLimit(commentIds, 10, (parentId, callback) => {
api({
uri: `${isAdmin ? '/admin' : `/users/${ownerUsername}`}/projects/${projectId}/comments/${parentId}/replies`,
authentication: token ? token : null,
diff --git a/test/integration/README.md b/test/integration/README.md
index 251e5d29a..4af0db93a 100644
--- a/test/integration/README.md
+++ b/test/integration/README.md
@@ -12,10 +12,10 @@
* Tests can be run using Saucelabs, an online service that can test browser/os combinations remotely. Currently all tests are written for use for chrome on mac.
## Using tap
-* Run all tests in the smoke-testing directory from the command-line: `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu npm run smoke`
+* Run all tests in the smoke-testing directory from the command-line: `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu npm run test:smoke`
* To run a single file from the command-line: `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password ROOT_URL=https://scratch.mit.edu node_modules/.bin/tap ./test/integration/smoke-testing/filename.js --timeout=3600`
* The timeout var is for the length of the entire tap test-suite; if you are getting a timeout error, you may need to adjust this value (some of the Selenium tests take a while to run)
-* To run tests using saucelabs run this command `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password SAUCE_USERNAME=saucelabsUsername SAUCE_ACCESS_KEY=saucelabsAccessKey ROOT_URL=https://scratch.mit.edu npm run smoke-sauce`
+* To run tests using saucelabs run this command `$ SMOKE_USERNAME=username SMOKE_PASSWORD=password SAUCE_USERNAME=saucelabsUsername SAUCE_ACCESS_KEY=saucelabsAccessKey ROOT_URL=https://scratch.mit.edu npm run test:smoke:sauce`
### Configuration
@@ -25,7 +25,7 @@
| `ROOT_URL` | `scratch.ly` | Location you want to run the tests against |
| `SMOKE_USERNAME` | `None` | Username for Scratch user you're signing in with to test |
| `SMOKE_PASSWORD` | `None` | Password for Scratch user you're signing in with to test |
-| `SMOKE_REMOTE` | `false` | Tests with Sauce Labs or not. True if running smoke-sauce |
+| `SMOKE_REMOTE` | `false` | Tests with Sauce Labs or not. True if running test:smoke:sauce |
| `SMOKE_HEADLESS` | `false` | Run browser in headless mode. Flaky at the moment |
| `SAUCE_USERNAME` | `None` | Username for your Sauce Labs account |
| `SAUCE_ACCESS_KEY` | `None` | Access Key for Sauce Labs found under User Settings |
diff --git a/webpack.config.js b/webpack.config.js
index 8428cbdae..3118a4bb5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -81,7 +81,8 @@ module.exports = {
include: [
path.resolve(__dirname, 'src'),
/node_modules[\\/]scratch-[^\\/]+[\\/]src/,
- /node_modules[\\/]pify/
+ /node_modules[\\/]pify/,
+ /node_modules[\\/]async/
]
},
{