Merge pull request #96 from duyoji/fix/lint-errors#95

Fix lint errors

package.json

@@ -62,7 +62,7 @@
     "jest:server": "jest server",
     "eject": "react-scripts eject",
     "eslint": "./node_modules/.bin/eslint src server",
-    "postinstall": "yarn jest:server && yarn build"
+    "postinstall": "yarn eslint && yarn jest && yarn build"
   },
   "devDependencies": {
     "eslint": "^4.13.1",

server/__tests__/socketHandlers/closeGame.js

@@ -33,9 +33,7 @@ describe('server/socketHandlers/closeGame.js', () => {
   });
 
   it('should emit data when error happens.', () => {
-    let receivedEventTypeFromOn = '';
-    const callbackForOn = (eventType, callback) => {
-      receivedEventTypeFromOn = eventType;
+    const callbackForOn = (eventType, callback) => { // eslint-disable-line no-unused-vars
       callback();
     };
 

server/__tests__/socketHandlers/getRooms.js

@@ -44,13 +44,11 @@ describe('server/socketHandlers/getRooms.js', () => {
   });
 
   it('should include error if there is error', () => {
-    let receivedEventTypeFromOn = '';
-    const callbackForOn = (eventType, callback) => {
-      receivedEventTypeFromOn = eventType;
+    const callbackForOn = (eventType, callback) => { // eslint-disable-line no-unused-vars
       callback();
     };
 
-    let receivedEventTypeFromEmit = '';
+    let receivedEventTypeFromEmit = ''; // eslint-disable-line no-unused-vars
     let receivedDataFromEmit = null;
     const callbackForEmit = (eventType, data) => {
       receivedEventTypeFromEmit = eventType;

server/__tests__/socketHandlers/updateLocation.js

@@ -21,7 +21,7 @@ describe('server/socketHandlers/updateLocation.js', () => {
     longitude: 9999
   };
   const DUMMY_NAME = 'USER_NAME';
-  const DUMMY_ICON_URL = 'https://oni-on-cheese.heroku.com/icon.png'
+  const DUMMY_ICON_URL = 'https://oni-on-cheese.heroku.com/icon.png';
 
   beforeAll((done) => {
     // Wait for connecting to redis
@@ -73,9 +73,7 @@ describe('server/socketHandlers/updateLocation.js', () => {
   });
 
   it('should includes error in emitted data when `roomId` is not passed.', () => {
-    let receivedEventTypeFromOn = '';
-    const callbackForOn = (eventType, callback) => {
-      receivedEventTypeFromOn = eventType;
+    const callbackForOn = (eventType, callback) => { // eslint-disable-line no-unused-vars
       callback({
         location: DUMMY_LOCATION
       });
@@ -104,9 +102,7 @@ describe('server/socketHandlers/updateLocation.js', () => {
   });
 
   it('should includes error in emitted data when `location` is not passed.', () => {
-    let receivedEventTypeFromOn = '';
-    const callbackForOn = (eventType, callback) => {
-      receivedEventTypeFromOn = eventType;
+    const callbackForOn = (eventType, callback) => { // eslint-disable-line no-unused-vars
       callback({
         roomId: DUMMY_ROOM_ID,
       });

server/socketHandlers/joinRoom.js

@@ -15,7 +15,7 @@ const joinRoom = (socket, socketNamespace) => {
       }
 
       // For user joining this room.
-      socket.emit(EVENT_TYPES.EMIT, formatOutput({data: `Join succeeded.`}));
+      socket.emit(EVENT_TYPES.EMIT, formatOutput({data: 'Join succeeded.'}));
 
       // For users already joined this room.
       socket.to(roomId).emit(EVENT_TYPES.EMIT, formatOutput({data: `${socket.id} has joined this room.`}));

server/socketHandlers/updateLocation.js

@@ -31,11 +31,11 @@ const updateLocation = (socket, socketNamespace) => {
       })
       .then(user => {
         socketNamespace.in(roomId).emit(EVENT_TYPES.EMIT, formatOutput({data: user.serialize()}));
-        console.log(`Emitted to ${roomId} from ${id} of user, location: ${location}`);
+        console.log(`Emitted to ${roomId} from ${id} of user, location: ${location}`); // eslint-disable-line no-console
       })
       .catch(error => {
         socket.emit(EVENT_TYPES.EMIT, formatOutput({error}));
-        console.error(`Error: Tried to emit to ${roomId} from ${id} of user, the reason of error is ${error}`);
+        console.error(`Error: Tried to emit to ${roomId} from ${id} of user, the reason of error is ${error}`); // eslint-disable-line no-console
       });
   });
 };

src/__tests__/actions/clearUsers.js

@@ -1,9 +1,7 @@
 import { clearUsers } from '../../actions/clearUsers';
-import { getDefaultState } from '../../reducers/index';
 
 describe('src/actions/clearUsers.js', () => {
   it('return expected action.', () => {
-    const userName = 'DUMMY_USER_NAME';
     expect(clearUsers()).toEqual({
       type: 'CLEAR_USERS'
     });

src/__tests__/actions/connectedToSocket.js

@@ -1,5 +1,4 @@
 import { connectedToSocket } from '../../actions/connectedToSocket';
-import { getDefaultState } from '../../reducers/index';
 
 describe('src/actions/connectedToSocket.js', () => {
   it('return expected action.', () => {

src/__tests__/actions/helpers/joinRoomHelper.js

@@ -1,6 +1,5 @@
 import { joinRoomPromise } from '../../../actions/helpers/joinRoomHelper';
 import socket from '../../socketHandlers/index';
-import { expectation } from 'sinon';
 
 describe('src/__tests__/actions/helpers/joinRoomHelper.js', () => {
   afterAll(() => {

src/__tests__/actions/joinRoom.js

@@ -24,7 +24,7 @@ describe('src/__tests__/actions/joinRoom.js', () => {
     });
 
     return store.dispatch( joinRoom(roomId) )
-      .then((data) => {
+      .then((data) => { // eslint-disable-line no-unused-vars
         const expectedActions = store.getActions();
         expect(expectedActions[0]).toEqual({
           type: 'JOIN_ROOM',

src/__tests__/actions/leaveRoom.js

@@ -1,5 +1,4 @@
 import { leaveRoom } from '../../actions/leaveRoom';
-import { getDefaultState } from '../../reducers/index';
 
 describe('src/actions/leaveRoom.js', () => {
   it('return expected action.', () => {

src/__tests__/actions/setUserName.js

@@ -1,5 +1,4 @@
 import { setUserName } from '../../actions/setUserName';
-import { getDefaultState } from '../../reducers/index';
 
 describe('src/actions/setUserName.js', () => {
   it('return expected action.', () => {

src/__tests__/actions/updateLocation.js

@@ -1,5 +1,4 @@
 import { updateLocation } from '../../actions/updateLocation';
-import { getDefaultState } from '../../reducers/index';
 
 describe('src//actions/updateLocation.js', () => {
   it('return expected action.', () => {

src/__tests__/components/App.js

@@ -1,8 +1,7 @@
-import React from 'react';
+import React from 'react'; // eslint-disable-line no-unused-vars
 import { MemoryRouter } from 'react-router-dom'; // eslint-disable-line no-unused-vars
 import App from '../../components/App'; // eslint-disable-line no-unused-vars
 import { Provider } from 'react-redux'; // eslint-disable-line no-unused-vars
-import { createStore } from 'redux';
 import { mount } from '../helpers/configuredEnzymeWithAdapter';
 import { getDefaultState } from '../../reducers/index';
 import configureMockStore from 'redux-mock-store';
@@ -22,7 +21,7 @@ describe('src/components/App.jsx', () => {
     it('redirect to login page.', () => {
       const wrapper = createWrapper('/');
       expect(wrapper.find('.topPage').length).toBe(1);
-    })
+    });
   });
 
   describe('When access to `/game-list`', () => {
@@ -44,7 +43,7 @@ describe('src/components/App.jsx', () => {
 });
 
 const createWrapper = (path) => {
-const store = mockStore(getDefaultState());
+  const store = mockStore(getDefaultState());
 
   return mount(
     <Provider store={store}>

src/__tests__/components/GameListPage.js

@@ -1,6 +1,5 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import GameListPage from '../../components/GameListPage';
+import React from 'react'; // eslint-disable-line no-unused-vars
+import GameListPage from '../../components/GameListPage'; // eslint-disable-line no-unused-vars
 import { ListGroup, ListGroupItem } from 'reactstrap';
 import { Redirect } from 'react-router-dom';
 import { shallow } from '../helpers/configuredEnzymeWithAdapter';

src/__tests__/components/Header.js

@@ -1,6 +1,5 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import Header from '../../components/Header';
+import React from 'react'; // eslint-disable-line no-unused-vars
+import Header from '../../components/Header'; // eslint-disable-line no-unused-vars
 import { Navbar, NavbarBrand } from 'reactstrap';
 import { shallow } from '../helpers/configuredEnzymeWithAdapter';
 

src/__tests__/components/MapPage.js

@@ -1,6 +1,5 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import MapPage from '../../components/MapPage';
+import React from 'react'; // eslint-disable-line no-unused-vars
+import MapPage from '../../components/MapPage'; // eslint-disable-line no-unused-vars
 import { shallow } from '../helpers/configuredEnzymeWithAdapter';
 import * as utilLocation from '../../utils/location';
 import sinon from 'sinon';
@@ -43,7 +42,7 @@ describe('src/components/MapPage.jsx', () => {
       expect(typeof error).toEqual('function');
       expect(options).toEqual(undefined);
 
-      success(createMockLocation())
+      success(createMockLocation());
     });
     sinon.stub(utilLocation, 'watchPosition').callsFake(({success, error, options}) => {
       expect(typeof success).toEqual('function');

src/__tests__/components/loaders/MapLoader.js

@@ -1,6 +1,6 @@
-import React from 'react';
+import React from 'react'; // eslint-disable-line no-unused-vars
 import { shallow } from '../../helpers/configuredEnzymeWithAdapter';
-import MapLoader from '../../../components/loaders/MapLoader';
+import MapLoader from '../../../components/loaders/MapLoader'; // eslint-disable-line no-unused-vars
 import { BeatLoader } from 'react-spinners';
 
 describe('src/components/loaders/MapLoader.jsx', () => {

src/__tests__/components/modals/InputUserNameModal.js

@@ -1,6 +1,6 @@
-import React from 'react';
+import React from 'react'; // eslint-disable-line no-unused-vars
 import { shallow } from '../../helpers/configuredEnzymeWithAdapter';
-import InputUserNameModal from '../../../components/modals/InputUserNameModal';
+import InputUserNameModal from '../../../components/modals/InputUserNameModal'; // eslint-disable-line no-unused-vars
 import { Modal } from 'reactstrap';
 import '../../helpers/mockLocalStorage';
 
@@ -25,4 +25,4 @@ describe('src/components/modals/InputUserNameModal.jsx', () => {
   });
 });
 
-const craeteMockFunctionOfSetUserName = (userName) => {};
+const craeteMockFunctionOfSetUserName = (userName) => {}; // eslint-disable-line no-unused-vars

src/__tests__/containers/App.js

@@ -1,8 +1,12 @@
 import AppContainer from '../../containers/App';
 import AppComponent from '../../components/App';
-
+import socket from '../../socketHandlers/index';
 
 describe('src/containers/App', () => {
+  afterAll(() => {
+    socket.disconnect();
+  });
+
   it('should includes App component as a wrapped component.', () => {
     expect(AppContainer.WrappedComponent).toEqual(AppComponent);
   });

src/__tests__/containers/GameListPage.js

@@ -1,7 +1,12 @@
 import GameListPageContainer from '../../containers/GameListPage';
 import GameListPageComponent from '../../components/GameListPage';
+import socket from '../../socketHandlers/index';
 
 describe('src/containers/App', () => {
+  afterAll(() => {
+    socket.disconnect();
+  });
+
   it('should includes GameListPage component as a wrapped component.', () => {
     expect(GameListPageContainer.WrappedComponent).toEqual(GameListPageComponent);
   });

src/__tests__/containers/MapPage.js

@@ -1,7 +1,12 @@
 import MapPageContainer from '../../containers/MapPage';
 import MapPageComponent from '../../components/MapPage';
+import socket from '../../socketHandlers/index';
 
 describe('src/containers/MapPage.js', () => {
+  afterAll(() => {
+    socket.disconnect();
+  });
+
   it('should includes MapPage component as a wrapped component.', () => {
     expect(MapPageContainer.WrappedComponent).toEqual(MapPageComponent);
   });

src/__tests__/helpers/mockLocalStorage.js

@@ -1,5 +1,5 @@
 // This file is for tests that use window.localStorage.
 // Thanks to this file, we can avoid errors such as `TypeError: Cannot read property 'getItem' of undefined`
 window.localStorage = window.localStorage || {};
-window.localStorage.setItem = window.localStorage.setItem || ((key, value) => {});
-window.localStorage.getItem = window.localStorage.getItem || ((key) => {});
+window.localStorage.setItem = window.localStorage.setItem || ((key, value) => {}); // eslint-disable-line no-unused-vars
+window.localStorage.getItem = window.localStorage.getItem || ((key) => {}); // eslint-disable-line no-unused-vars

src/__tests__/socketHandlers/connect.js

@@ -1,6 +1,6 @@
 import {addHandlerListener} from '../../socketHandlers/connect';
 import socket from '../../socketHandlers/index';
-import sinon, { expectation } from 'sinon';
+import sinon from 'sinon';
 
 describe('src/socketHandlers/connect.js', () => {
   afterAll(() => {

src/__tests__/socketHandlers/leaveRoom.js

@@ -1,6 +1,6 @@
 import { addHandlerListener } from '../../socketHandlers/leaveRoom';
 import socket from '../../socketHandlers/index';
-import sinon, { expectation } from 'sinon';
+import sinon from 'sinon';
 
 describe('src/socketHandlers/updateLocation.js', () => {
   afterAll(() => {

src/__tests__/socketHandlers/reconnect.js

@@ -1,6 +1,6 @@
 import {addHandlerListener} from '../../socketHandlers/reconnect';
 import socket from '../../socketHandlers/index';
-import sinon, { expectation } from 'sinon';
+import sinon from 'sinon';
 
 describe('src/socketHandlers/reconnect.js', () => {
   afterAll(() => {

src/__tests__/socketHandlers/updateLocation.js

@@ -1,6 +1,6 @@
 import {emit, addHandlerListener} from '../../socketHandlers/updateLocation';
 import socket from '../../socketHandlers/index';
-import sinon, { expectation } from 'sinon';
+import sinon from 'sinon';
 
 describe('src/socketHandlers/updateLocation.js', () => {
   const LATITUDE = 12345;

src/__tests__/utils/localStorage.js

@@ -6,8 +6,8 @@ const mockLocalStorage = {};
 describe('src/utils/localStorage.js', () => {
   beforeAll(() => {
     window.localStorage = window.localStorage || {};
-    window.localStorage.setItem = window.localStorage.setItem || ((key, value) => {});
-    window.localStorage.getItem = window.localStorage.getItem || ((key) => {});
+    window.localStorage.setItem = window.localStorage.setItem || ((key, value) => {}); // eslint-disable-line no-unused-vars
+    window.localStorage.getItem = window.localStorage.getItem || ((key) => {}); // eslint-disable-line no-unused-vars
   });
 
   describe('The setUserName function', () => {

src/__tests__/utils/location.js

@@ -7,16 +7,16 @@ describe('src/utils/location.js', () => {
     code: 1234,
     message: 'This is dummy error.'
   };
-  let callbackForSuccess = ({latitude, longitude}) => {};
-  let callbackForError = (err) => {};
+  let callbackForSuccess = ({latitude, longitude}) => {}; // eslint-disable-line no-unused-vars
+  let callbackForError = (err) => {}; // eslint-disable-line no-unused-vars
 
   describe('The getCurrentPosition function', () => {
     let isSuccess = true;
 
     beforeAll(() => {
       navigator.geolocation = navigator.geolocation || {};
       navigator.geolocation.getCurrentPosition
-        = navigator.geolocation.getCurrentPosition || function(success, error, options) {
+        = navigator.geolocation.getCurrentPosition || function(success, error, options) { // eslint-disable-line no-unused-vars
           if(isSuccess) {
             const position = {
               latitude: DUMMY_LATITUDE,
@@ -26,7 +26,7 @@ describe('src/utils/location.js', () => {
           } else {
             callbackForError(DUMMY_ERROR);
           }
-      };
+        };
     });
 
     afterAll(() => {
@@ -67,7 +67,7 @@ describe('src/utils/location.js', () => {
     beforeAll(() => {
       navigator.geolocation = navigator.geolocation || {};
       navigator.geolocation.watchPosition
-        = navigator.geolocation.watchPosition || function(success, error, options) {
+        = navigator.geolocation.watchPosition || function(success, error, options) { // eslint-disable-line no-unused-vars
           if(isSuccess) {
             const position = {
               latitude: DUMMY_LATITUDE,
@@ -77,7 +77,7 @@ describe('src/utils/location.js', () => {
           } else {
             callbackForError(DUMMY_ERROR);
           }
-      };
+        };
     });
 
     afterAll(() => {

src/actions/connectedToSocket.js

@@ -2,7 +2,7 @@ const connectedToSocket = (socketId) => {
   return {
     type: 'CONNECTED_TO_SOCKET',
     socketId
-  }
+  };
 };
 
 export { connectedToSocket };

src/actions/getRooms.js

@@ -7,9 +7,9 @@ const getRooms = () => {
       dispatch(getRoomsSuccess(roomIds));
     } catch(err) {
       // TODO: We have to decide a specification when error happen.
-      console.error(err);
+      console.error(err); // eslint-disable-line no-console
     }
-  }
+  };
 };
 
 const getRoomsSuccess = (roomIds) => ({