Skip to content

Commit 418ca19

Browse files
committed
outbox tests [nfc]: Tighten up code style a bit
1 parent 21be74d commit 418ca19

File tree

1 file changed

+31
-56
lines changed

1 file changed

+31
-56
lines changed
Lines changed: 31 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// @flow strict-local
1+
/* @flow strict-local */
22
import deepFreeze from 'deep-freeze';
33

44
import outboxReducer from '../outboxReducer';
@@ -12,96 +12,71 @@ describe('outboxReducer', () => {
1212
const message1 = eg.streamOutbox({ content: 'New one' });
1313
const message2 = eg.streamOutbox({ content: 'Another one' });
1414
const message3 = eg.streamOutbox({ content: 'Message already sent', isSent: true });
15-
const initialState = deepFreeze([message1, message2, message3]);
1615

17-
const action = eg.action.register_complete;
18-
19-
const expectedState = [message1, message2];
20-
21-
const actualState = outboxReducer(initialState, action);
22-
23-
expect(actualState).toEqual(expectedState);
16+
const prevState = deepFreeze([message1, message2, message3]);
17+
expect(outboxReducer(prevState, eg.action.register_complete)).toEqual([message1, message2]);
2418
});
2519
});
2620

2721
describe('MESSAGE_SEND_START', () => {
2822
test('add a new message to the outbox', () => {
2923
const message = eg.streamOutbox({ content: 'New one' });
3024

31-
const initialState = deepFreeze([]);
32-
33-
const action = deepFreeze({
34-
type: MESSAGE_SEND_START,
35-
outbox: message,
36-
});
37-
38-
const expectedState = [message];
39-
40-
const actualState = outboxReducer(initialState, action);
41-
42-
expect(actualState).toEqual(expectedState);
25+
const prevState = deepFreeze([]);
26+
expect(
27+
outboxReducer(prevState, deepFreeze({ type: MESSAGE_SEND_START, outbox: message })),
28+
).toEqual([message]);
4329
});
4430

4531
test('do not add a message with a duplicate timestamp to the outbox', () => {
4632
const message1 = eg.streamOutbox({ content: 'hello', timestamp: 123 });
4733
const message2 = eg.streamOutbox({ content: 'hello twice', timestamp: 123 });
4834

49-
const initialState = deepFreeze([message1]);
50-
51-
const action = deepFreeze({
52-
type: MESSAGE_SEND_START,
53-
outbox: message2,
54-
});
55-
56-
const actualState = outboxReducer(initialState, action);
57-
58-
expect(actualState).toBe(initialState);
35+
const prevState = deepFreeze([message1]);
36+
expect(
37+
outboxReducer(prevState, deepFreeze({ type: MESSAGE_SEND_START, outbox: message2 })),
38+
).toBe(prevState);
5939
});
6040
});
6141

6242
describe('EVENT_NEW_MESSAGE', () => {
6343
test('do not mutate state if a message is not removed', () => {
64-
const initialState = deepFreeze([eg.streamOutbox({ timestamp: 546 })]);
65-
6644
const message = eg.streamMessage({ timestamp: 123 });
6745

68-
const action = eg.mkActionEventNewMessage(message, {
69-
local_message_id: message.timestamp,
70-
});
71-
72-
const actualState = outboxReducer(initialState, action);
73-
expect(actualState).toBe(initialState);
46+
const prevState = deepFreeze([eg.streamOutbox({ timestamp: 546 })]);
47+
expect(
48+
outboxReducer(
49+
prevState,
50+
eg.mkActionEventNewMessage(message, { local_message_id: message.timestamp }),
51+
),
52+
).toBe(prevState);
7453
});
7554

7655
test('remove message if local_message_id matches', () => {
7756
const message1 = eg.streamOutbox({ timestamp: 546 });
7857
const message2 = eg.streamOutbox({ timestamp: 150238512430 });
7958
const message3 = eg.streamOutbox({ timestamp: 150238594540 });
80-
const initialState = deepFreeze([message1, message2, message3]);
8159

82-
const action = eg.mkActionEventNewMessage(eg.streamMessage(), {
83-
local_message_id: 546,
84-
});
85-
86-
const expectedState = [message2, message3];
87-
88-
const actualState = outboxReducer(initialState, action);
89-
90-
expect(actualState).toEqual(expectedState);
60+
const prevState = deepFreeze([message1, message2, message3]);
61+
expect(
62+
outboxReducer(
63+
prevState,
64+
eg.mkActionEventNewMessage(eg.streamMessage(), { local_message_id: 546 }),
65+
),
66+
).toEqual([message2, message3]);
9167
});
9268

9369
test("remove nothing if local_message_id doesn't match", () => {
9470
const message1 = eg.streamOutbox({ timestamp: 546 });
9571
const message2 = eg.streamOutbox({ timestamp: 150238512430 });
9672
const message3 = eg.streamOutbox({ timestamp: 150238594540 });
97-
const initialState = deepFreeze([message1, message2, message3]);
98-
99-
const action = eg.mkActionEventNewMessage(eg.streamMessage(), {
100-
local_message_id: 15023859,
101-
});
10273

103-
const actualState = outboxReducer(initialState, action);
104-
expect(actualState).toBe(initialState);
74+
const prevState = deepFreeze([message1, message2, message3]);
75+
const actualState = outboxReducer(
76+
prevState,
77+
eg.mkActionEventNewMessage(eg.streamMessage(), { local_message_id: 15023859 }),
78+
);
79+
expect(actualState).toBe(prevState);
10580
});
10681
});
10782
});

0 commit comments

Comments
 (0)