e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move wrapWidth handling out of MessageBox, improve scroll position handling, use custom routing, close menu when clicking anywhere

Browse source
This commit is contained in:
Ken-Håvard Lieng 2017-05-07 22:19:15 +02:00
parent a753efd1dd
commit fec7c93abc
24 changed files with 363 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

27
client/src/js/__tests__/reducer-tab.test.js
View file

@ -1,10 +1,10 @@
import { LOCATION_CHANGE } from 'react-router-redux';
import reducer from '../reducers/tab';
import * as actions from '../actions';
import { setSelectedTab } from '../actions/tab';
import { locationChanged } from '../util/router';
describe('reducers/tab', () => {
it('sets the tab and adds it to history', () => {
it('selects the tab and adds it to history', () => {
let state = reducer(undefined, setSelectedTab('srv', '#chan'));
expect(state.toJS()).toEqual({
@ -90,12 +90,7 @@ describe('reducers/tab', () => {
it('clears the tab when navigating to a non-tab page', () => {
let state = reducer(undefined, setSelectedTab('srv', '#chan'));
state = reducer(state, {
type: LOCATION_CHANGE,
payload: {
pathname: '/settings'
}
});
state = reducer(state, locationChanged('settings'));
expect(state.toJS()).toEqual({
selected: { server: null, name: null },
@ -104,4 +99,20 @@ describe('reducers/tab', () => {
]
});
});
it('selects the tab and adds it to history when navigating to a tab', () => {
const state = reducer(undefined,
locationChanged('chat', {
server: 'srv',
name: '#chan'
})
);
expect(state.toJS()).toEqual({
selected: { server: 'srv', name: '#chan' },
history: [
{ server: 'srv', name: '#chan' }
]
});
});
});