From 7b25c4550cf1a170c5cb770785499ef3882ba1b3 Mon Sep 17 00:00:00 2001 From: Qolzam Date: Sat, 8 Jul 2017 10:41:02 +0430 Subject: [PATCH] Change LICENSE location and add authourizeReducer test --- docs/LICENSE => LICENSE | 14 +++-- app/reducers/authorizeReducer.jsx | 1 + app/tests/components/Blog.test.jsx | 2 +- app/tests/components/Circle.test.jsx | 2 +- app/tests/components/Comment.test.jsx | 2 +- app/tests/components/CommentWrite.test.jsx | 2 +- app/tests/components/CommnetList.jsx | 2 +- app/tests/components/EditProfile.test.jsx | 2 +- app/tests/components/FindPeople.test.jsx | 2 +- app/tests/components/Followers.test.jsx | 2 +- app/tests/components/Following.test.jsx | 2 +- app/tests/components/Home.test.jsx | 2 +- app/tests/components/HomeHeader.test.jsx | 2 +- app/tests/components/ImageGallery.test.jsx | 2 +- app/tests/components/Img.test.jsx | 2 +- app/tests/components/ImgCover.test.jsx | 2 +- app/tests/components/Login.test.jsx | 2 +- app/tests/components/Master.test.jsx | 2 +- app/tests/components/NotifyItem.test.jsx | 2 +- app/tests/components/Post.test.jsx | 2 +- app/tests/components/PostWrite.test.jsx | 2 +- app/tests/components/Settings.test.jsx | 2 +- app/tests/components/Sidebar.test.jsx | 2 +- app/tests/components/Signup.test.jsx | 2 +- app/tests/components/UserBox.test.jsx | 2 +- app/tests/components/UserBoxList.test.jsx | 2 +- app/tests/components/YourCircles.test.jsx | 2 +- app/tests/reducers/authorizeReducer.test.jsx | 64 ++++++++++++++++++++ docs/README.md | 2 +- karma.conf.js | 1 + 30 files changed, 100 insertions(+), 32 deletions(-) rename docs/LICENSE => LICENSE (64%) create mode 100644 app/tests/reducers/authorizeReducer.test.jsx diff --git a/docs/LICENSE b/LICENSE similarity index 64% rename from docs/LICENSE rename to LICENSE index f11fc6e..c5fc422 100644 --- a/docs/LICENSE +++ b/LICENSE @@ -1,11 +1,13 @@ +MIT License + Copyright (c) 2017 Amir Movahedi -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/app/reducers/authorizeReducer.jsx b/app/reducers/authorizeReducer.jsx index ad6a241..8024d9f 100644 --- a/app/reducers/authorizeReducer.jsx +++ b/app/reducers/authorizeReducer.jsx @@ -22,6 +22,7 @@ export var authorizeReducer = (state = defaultState, action) =>{ switch (action.type) { case types.LOGIN: return{ + ...state, uid: action.uid, authed: true, guest:false diff --git a/app/tests/components/Blog.test.jsx b/app/tests/components/Blog.test.jsx index 31e107c..7cb2bdc 100644 --- a/app/tests/components/Blog.test.jsx +++ b/app/tests/components/Blog.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Circle.test.jsx b/app/tests/components/Circle.test.jsx index 89a8b88..9ada7a5 100644 --- a/app/tests/components/Circle.test.jsx +++ b/app/tests/components/Circle.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Comment.test.jsx b/app/tests/components/Comment.test.jsx index f22dff3..bac2a5a 100644 --- a/app/tests/components/Comment.test.jsx +++ b/app/tests/components/Comment.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/CommentWrite.test.jsx b/app/tests/components/CommentWrite.test.jsx index 8f9a264..0cca6ba 100644 --- a/app/tests/components/CommentWrite.test.jsx +++ b/app/tests/components/CommentWrite.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/CommnetList.jsx b/app/tests/components/CommnetList.jsx index 8684ae0..ed8f1cb 100644 --- a/app/tests/components/CommnetList.jsx +++ b/app/tests/components/CommnetList.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/EditProfile.test.jsx b/app/tests/components/EditProfile.test.jsx index 5fb7bac..dde9481 100644 --- a/app/tests/components/EditProfile.test.jsx +++ b/app/tests/components/EditProfile.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/FindPeople.test.jsx b/app/tests/components/FindPeople.test.jsx index 23859a0..c1a9efd 100644 --- a/app/tests/components/FindPeople.test.jsx +++ b/app/tests/components/FindPeople.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Followers.test.jsx b/app/tests/components/Followers.test.jsx index 7e60969..7592e45 100644 --- a/app/tests/components/Followers.test.jsx +++ b/app/tests/components/Followers.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Following.test.jsx b/app/tests/components/Following.test.jsx index e0d2c9e..0acc0e1 100644 --- a/app/tests/components/Following.test.jsx +++ b/app/tests/components/Following.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Home.test.jsx b/app/tests/components/Home.test.jsx index 2a6fe4e..b81e0fd 100644 --- a/app/tests/components/Home.test.jsx +++ b/app/tests/components/Home.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/HomeHeader.test.jsx b/app/tests/components/HomeHeader.test.jsx index f8b1922..ad79f69 100644 --- a/app/tests/components/HomeHeader.test.jsx +++ b/app/tests/components/HomeHeader.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/ImageGallery.test.jsx b/app/tests/components/ImageGallery.test.jsx index 8ec0c8c..d406b45 100644 --- a/app/tests/components/ImageGallery.test.jsx +++ b/app/tests/components/ImageGallery.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Img.test.jsx b/app/tests/components/Img.test.jsx index e5765f2..dfda0d7 100644 --- a/app/tests/components/Img.test.jsx +++ b/app/tests/components/Img.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/ImgCover.test.jsx b/app/tests/components/ImgCover.test.jsx index eb74892..fbec77c 100644 --- a/app/tests/components/ImgCover.test.jsx +++ b/app/tests/components/ImgCover.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Login.test.jsx b/app/tests/components/Login.test.jsx index a03f940..74fd227 100644 --- a/app/tests/components/Login.test.jsx +++ b/app/tests/components/Login.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Master.test.jsx b/app/tests/components/Master.test.jsx index 55a277d..1b57689 100644 --- a/app/tests/components/Master.test.jsx +++ b/app/tests/components/Master.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/NotifyItem.test.jsx b/app/tests/components/NotifyItem.test.jsx index 6a3e781..cca338b 100644 --- a/app/tests/components/NotifyItem.test.jsx +++ b/app/tests/components/NotifyItem.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Post.test.jsx b/app/tests/components/Post.test.jsx index f8d7adb..54693df 100644 --- a/app/tests/components/Post.test.jsx +++ b/app/tests/components/Post.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/PostWrite.test.jsx b/app/tests/components/PostWrite.test.jsx index a180f5f..aa9e13a 100644 --- a/app/tests/components/PostWrite.test.jsx +++ b/app/tests/components/PostWrite.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Settings.test.jsx b/app/tests/components/Settings.test.jsx index 6a2aff0..f9120c1 100644 --- a/app/tests/components/Settings.test.jsx +++ b/app/tests/components/Settings.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Sidebar.test.jsx b/app/tests/components/Sidebar.test.jsx index b9d9239..2f28c7f 100644 --- a/app/tests/components/Sidebar.test.jsx +++ b/app/tests/components/Sidebar.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/Signup.test.jsx b/app/tests/components/Signup.test.jsx index 957ca86..48e4cc3 100644 --- a/app/tests/components/Signup.test.jsx +++ b/app/tests/components/Signup.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/UserBox.test.jsx b/app/tests/components/UserBox.test.jsx index 75bf7cc..906cb24 100644 --- a/app/tests/components/UserBox.test.jsx +++ b/app/tests/components/UserBox.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/UserBoxList.test.jsx b/app/tests/components/UserBoxList.test.jsx index 76f91e7..3b7aaeb 100644 --- a/app/tests/components/UserBoxList.test.jsx +++ b/app/tests/components/UserBoxList.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/components/YourCircles.test.jsx b/app/tests/components/YourCircles.test.jsx index bb0f52d..0dc868d 100644 --- a/app/tests/components/YourCircles.test.jsx +++ b/app/tests/components/YourCircles.test.jsx @@ -1,6 +1,6 @@ var React = require('react'); var ReactDOM = require('react-dom'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var expect = require('expect'); var $ = require('jquery'); diff --git a/app/tests/reducers/authorizeReducer.test.jsx b/app/tests/reducers/authorizeReducer.test.jsx new file mode 100644 index 0000000..6a84311 --- /dev/null +++ b/app/tests/reducers/authorizeReducer.test.jsx @@ -0,0 +1,64 @@ +// - Import react components +var expect = require('expect') +var df = require('deep-freeze-strict') +import { authorizeReducer } from 'authorizeReducer' + +// - Import action types +import * as types from 'actionTypes' + + +/** + * Default state + */ +var defaultState = { + uid: 0, + authed: false, + updatePassword: false, + guest: false +} + +describe('authorizeReducer', () => { + it('should set user in login state', () => { + var action = { + type: types.LOGIN, + uid: 'user12345' + }; + var res = authorizeReducer(df(defaultState), df(action)); + + expect(res.uid).toEqual(action.uid) + expect(res.authed).toEqual(true) + expect(res.guest).toEqual(false) + }) + + it('should set user in logout state', () => { + var action = { + type: types.LOGOUT + }; + var res = authorizeReducer(df(defaultState), df(action)); + + expect(res.uid).toEqual(0) + expect(res.authed).toEqual(false) + expect(res.guest).toEqual(true) + }) + + it('should set uid in signup', () => { + var action = { + type: types.SIGNUP, + uid: 'user12345' + }; + var res = authorizeReducer(df(defaultState), df(action)); + + expect(res.uid).toEqual(action.uid) + }) + + it('should update password', () => { + var action = { + type: types.UPDATE_PASSWORD, + updatePassword: 'p@55w0rd' + }; + var res = authorizeReducer(df(defaultState), df(action)); + + expect(res.updatePassword).toEqual(action.updatePassword) + }) + +}) diff --git a/docs/README.md b/docs/README.md index e7de3a8..8f5f5e3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -79,4 +79,4 @@ and then install the package # License -This project is licensed under the MIT License - see the [LICENSE](https://github.com/Qolzam/react-social-network/blob/master/docs/LICENSE) file for details +This project is licensed under the MIT License - see the [LICENSE](https://github.com/Qolzam/react-social-network/blob/master/LICENSE) file for details diff --git a/karma.conf.js b/karma.conf.js index e9a79f7..1aa7a5c 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -3,6 +3,7 @@ var webpackConfig = require('./webpack.config.js'); module.exports = function (config) { config.set({ browsers: ['Chrome'], + browserNoActivityTimeout: 100000, singleRun: true, frameworks: ['mocha'], files: [