Merge branch 'master' into bump-node-npm-versions

* master: clean up remaining tests add copyObject helper put back sinon fix const vs let relocate and update tests Conflicts: README.md
jakemmarsh · May 12, 2016 · 3488257 · 3488257
2 parents 93a05a7 + 9f757c5
commit 3488257
Show file tree

Hide file tree

Showing 30 changed files with 517 additions and 501 deletions.
diff --git a/README.md b/README.md
@@ -36,13 +36,13 @@ Along with many Gulp libraries (these can be seen in either `package.json`, or a
 
 1. If you haven't already, follow steps 1 & 2 above
 2. If you haven't already run `gulp dev` or `npm run build` at least once, run `npm run build`
-3. Run all tests in the `__tests__/` directory with the `gulp test` command
+3. Run all tests in the `tests/` directory with the `gulp test` command
   * A single file can be run by specifing an `-f` flag: `gulp test -f <PATH_TO_TEST_FILE>`
-    * In the `PATH_TO_TEST_FILE`, it is possible to omit the `__tests__/` prefix, as well as the `.test.js` suffix. They will be automatically added if not detected.
+    * In the `PATH_TO_TEST_FILE`, it is possible to omit the `tests/` prefix, as well as the `.test.js` suffix. They will be automatically added if not detected.
 
 ##### Code coverage
 
-When running tests, code coverage will be automatically calculated and output to an HTML file using the [Istanbul](https://github.com/gotwarlost/istanbul) library. These files can be seen in the generated `__coverage__/` directory.
+When running tests, code coverage will be automatically calculated and output to an HTML file using the [Istanbul](https://github.com/gotwarlost/istanbul) library. These files can be seen in the generated `coverage/` directory.
 
 ---
 

diff --git a/__tests__/App.test.js b/__tests__/App.test.js
diff --git a/__tests__/components/Footer.test.js b/__tests__/components/Footer.test.js
diff --git a/__tests__/components/Header.test.js b/__tests__/components/Header.test.js
diff --git a/__tests__/pages/HomePage.test.js b/__tests__/pages/HomePage.test.js
diff --git a/__tests__/pages/NotFoundPage.test.js b/__tests__/pages/NotFoundPage.test.js
diff --git a/__tests__/pages/SearchPage.test.js b/__tests__/pages/SearchPage.test.js
diff --git a/__tests__/stores/CurrentUserStore.test.js b/__tests__/stores/CurrentUserStore.test.js
diff --git a/__tests__/utils/APIUtils.test.js b/__tests__/utils/APIUtils.test.js