Merge 12adf83 into 04d66a2

.gitignore

@@ -15,7 +15,7 @@ pids
 lib-cov
 
 # Coverage directory used by tools like istanbul
-coverage
+**/coverage
 
 # nyc test coverage
 .nyc_output

.travis.yml

@@ -7,7 +7,6 @@ install:
   - "npm run client:build"
 
 script:
-  - "npm run test"
   - "npm run client:coveralls"
 
 deploy:

README.md

@@ -16,6 +16,7 @@
   - [Running](#running)
   - [Stopping](#stopping)
   - [Testing](#testing)
+    - [Server](#server)
     - [Client](#client)
     - [Coveralls](#coveralls)
   - [Building](#building)
@@ -136,6 +137,20 @@ To run all tests with coverage:
 $ npm run test
 ```
 
+#### Server
+
+To run server tests in watch mode:
+
+```
+$ npm run server:test
+```
+
+To run server tests with coverage:
+
+```
+$ npm run server:test:coverage
+```
+
 #### Client
 
 To run client tests in watch mode:

client/src/actions/__tests__/user.test.js

@@ -13,7 +13,7 @@ describe('user actions', () => {
   describe('async actions', () => {
     describe('fetchAuthUser', () => {
       it('creates FETCH_AUTH_USER_SUCCESS when fetching user auth succeeds with a user', () => {
-        mockAxios.onGet('/api/auth').reply(200, {
+        mockAxios.onGet('/api/auth/user').reply(200, {
           user: 'foo',
         });
 
@@ -34,7 +34,7 @@ describe('user actions', () => {
       });
 
       it('creates FETCH_AUTH_USER_SUCCESS with a null profile when fetching user auth succeeds without a user', () => {
-        mockAxios.onGet('/api/auth').reply(200, {
+        mockAxios.onGet('/api/auth/user').reply(200, {
           user: undefined,
         });
 
@@ -55,7 +55,7 @@ describe('user actions', () => {
       });
 
       it('creates FETCH_AUTH_USER_FAILURE when fetching user auth fails', () => {
-        mockAxios.onGet('/api/auth').reply(400, 'foo');
+        mockAxios.onGet('/api/auth/user').reply(400, 'foo');
 
         const expectedActions = [{
           type: userActions.FETCH_AUTH_USER_REQ,

client/src/actions/user.js

@@ -58,7 +58,7 @@ export function fetchAuthUser() {
   return function fetchAuthUserThunk(dispatch) {
     dispatch(fetchAuthUserReq());
 
-    return axios.get('/api/auth')
+    return axios.get('/api/auth/user')
       .then(response =>
         // The request can still be successful with no user returned.
         // In this case, default to `null` (instead of `undefined`).

client/src/pages/VisualizationPage/components/TopAppBar/index.js

@@ -48,8 +48,8 @@ function TopAppBar(props) {
 TopAppBar.propTypes = {
   title: PropTypes.string.isRequired,
   user: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-    imageUrl: PropTypes.string.isRequired,
+    name: PropTypes.string,
+    imageUrl: PropTypes.string,
   }),
   classes: PropTypes.object.isRequired,
 };

client/src/pages/VisualizationPage/view.js

@@ -102,8 +102,8 @@ export class VisualizationPageView extends Component {
       },
     } = this.props;
 
-    const songPlaying = songArtistName !== undefined
-      && songTitle !== undefined;
+    const songPlaying = songArtistName !== null
+      && songTitle !== null;
 
     return (
       <div className={classes.root}>
@@ -122,8 +122,10 @@ export class VisualizationPageView extends Component {
           <ColorOverlay />
           <TopAppBar
             title="spune"
-            userName={userName}
-            userImageUrl={userImageUrl}
+            user={userName && userImageUrl ? {
+              name: userName,
+              imageUrl: userImageUrl,
+            } : undefined}
           />
           { songPlaying &&
             <div className={classes.content}>

jest.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  coverageDirectory: 'server/coverage',
+  collectCoverageFrom: [
+    'server/**/*.{js}',
+    '!server/server.js',
+    '!server/coverage/**',
+  ],
+  // By default, Jest runs in a JSDOM environment.
+  // This has issues: https://mongoosejs.com/docs/jest.html
+  testEnvironment: 'node',
+  testPathIgnorePatterns: [
+    'client',
+  ],
+};