Merge branch 'master' of https://github.com/coralproject/talk into notification-room

tests/client/coral-framework/store/authReducer.js

@@ -1,31 +0,0 @@
-import {Map} from 'immutable';
-import {expect} from 'chai';
-import authReducer from '../../../../client/coral-framework/store/reducers/auth';
-import * as actions from '../../../../client/coral-framework/store/actions/auth';
-
-describe ('authReducer', () => {
-  describe('SET_LOGGED_IN_USER', () => {
-    it('should set a logged in user', () => {
-      const action = {
-        type: actions.SET_LOGGED_IN_USER,
-        user_id: '123'
-      };
-      const store = new Map({});
-      const result = authReducer(store, action);
-      expect(result.get('user')).to.equal(action.user_id);
-    });
-  });
-
-  describe('LOG_OUT_USER', () => {
-    it('should clear the user store', () => {
-      const action = {
-        type: actions.LOG_OUT_USER
-      };
-      const store = new Map({
-        user: '123'
-      });
-      const result = authReducer(store, action);
-      expect(result.get('user')).to.equal(undefined);
-    });
-  });
-});

tests/client/coral-framework/store/itemActions.spec.js

@@ -2,7 +2,7 @@ import 'react';
 import 'redux';
 import {expect} from 'chai';
 import fetchMock from 'fetch-mock';
-import * as actions from '../../../../client/coral-framework/store/actions/items';
+import * as actions from '../../../../client/coral-framework/actions/items';
 import {Map} from 'immutable';
 
 import configureStore from 'redux-mock-store';

tests/client/coral-framework/store/itemReducer.spec.js

@@ -1,6 +1,6 @@
 import {Map, fromJS} from 'immutable';
 import {expect} from 'chai';
-import itemsReducer from '../../../../client/coral-framework/store/reducers/items';
+import itemsReducer from '../../../../client/coral-framework/reducers/items';
 
 describe ('itemsReducer', () => {
   describe('ADD_ITEM', () => {

tests/client/coral-framework/store/notificationReducer.spec.js

@@ -1,7 +1,7 @@
 import {Map} from 'immutable';
 import {expect} from 'chai';
-import notificationReducer from '../../../../client/coral-framework/store/reducers/notification';
-import * as actions from '../../../../client/coral-framework/store/actions/notification';
+import notificationReducer from '../../../../client/coral-framework/reducers/notification';
+import * as actions from '../../../../client/coral-framework/actions/notification';
 
 describe ('notificationsReducer', () => {
   describe('ADD_NOTIFICATION', () => {

tests/routes/api/auth/index.js

@@ -0,0 +1,39 @@
+require('../../../utils/mongoose');
+
+const app = require('../../../../app');
+const chai = require('chai');
+const expect = chai.expect;
+
+chai.use(require('chai-http'));
+
+const User = require('../../../../models/user');
+
+describe('POST /auth/local', () => {
+
+  beforeEach(() => {
+    return User.createLocalUser('maria@gmail.com', 'password!', 'Maria');
+  });
+
+  it('should send back the user on a successful login', () => {
+    return chai.request(app)
+      .post('/api/v1/auth/local')
+      .send({email: 'maria@gmail.com', password: 'password!'})
+      .catch((res) => {
+        expect(res).to.have.status(200);
+        expect(res).to.be.json;
+        expect(res.body).to.have.property('user');
+        expect(res.body.user).to.have.property('displayName', 'Maria');
+      });
+  });
+
+  it('should not send back the user on a unsuccessful login', () => {
+    return chai.request(app)
+      .post('/api/v1/auth/local')
+      .send({email: 'maria@gmail.com', password: 'password!3'})
+      .catch((err) => {
+        expect(err).to.not.be.null;
+        expect(err.response).to.have.status(401);
+        expect(err.response.body).to.have.property('message', 'not authorized');
+      });
+  });
+});