Skip to content

Commit f7e2a1f

Browse files
willemliufdmgwillemliufdmg
committed
Updated tests
1 parent 43de705 commit f7e2a1f

File tree

1 file changed

+54
-54
lines changed

1 file changed

+54
-54
lines changed

‎__tests__/ReSubstitute.test.ts

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ describe('ReSubstitute', () => {
2323

2424
resub.subscribe(onTriggerMock);
2525
resub.trigger();
26-
expect(onTriggerMock).toBeCalledTimes(0);
26+
expect(onTriggerMock).toHaveBeenCalledTimes(0);
2727

2828
ReSubstitute.popTriggerBlock();
29-
expect(onTriggerMock).toBeCalledTimes(0);
29+
expect(onTriggerMock).toHaveBeenCalledTimes(0);
3030

3131
ReSubstitute.popTriggerBlock();
32-
expect(onTriggerMock).toBeCalledTimes(1);
32+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
3333
});
3434

3535
test('should be able to bypass block correctly', () => {
@@ -42,12 +42,12 @@ describe('ReSubstitute', () => {
4242
resubBypass.subscribe(onBypassTriggerMock);
4343
resub.trigger();
4444
resubBypass.trigger();
45-
expect(onTriggerMock).toBeCalledTimes(0);
46-
expect(onBypassTriggerMock).toBeCalledTimes(1);
45+
expect(onTriggerMock).toHaveBeenCalledTimes(0);
46+
expect(onBypassTriggerMock).toHaveBeenCalledTimes(1);
4747

4848
ReSubstitute.popTriggerBlock();
49-
expect(onTriggerMock).toBeCalledTimes(1);
50-
expect(onBypassTriggerMock).toBeCalledTimes(1);
49+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
50+
expect(onBypassTriggerMock).toHaveBeenCalledTimes(1);
5151
});
5252

5353
test('should subscribe and unsubscribe correctly', () => {
@@ -56,7 +56,7 @@ describe('ReSubstitute', () => {
5656
const subToken = resub.subscribe(onTriggerMock);
5757
resub.unsubscribe(subToken);
5858
resub.trigger();
59-
expect(onTriggerMock).toBeCalledTimes(0);
59+
expect(onTriggerMock).toHaveBeenCalledTimes(0);
6060
});
6161

6262
test('should subscribe by key and be triggered correctly', () => {
@@ -69,14 +69,14 @@ describe('ReSubstitute', () => {
6969
resub.subscribe(onKeyTriggerMock, 'testKey');
7070

7171
resub.trigger();
72-
expect(onTriggerMock).toBeCalledTimes(1);
73-
expect(onKeyTriggerMock).toBeCalledTimes(0);
72+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
73+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(0);
7474
resub.trigger('testKey');
75-
expect(onTriggerMock).toBeCalledTimes(1);
76-
expect(onKeyTriggerMock).toBeCalledTimes(1);
75+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
76+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(1);
7777
resub.trigger(['testKey', ReSubstitute.Key_All]);
78-
expect(onTriggerMock).toBeCalledTimes(2);
79-
expect(onKeyTriggerMock).toBeCalledTimes(2);
78+
expect(onTriggerMock).toHaveBeenCalledTimes(2);
79+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(2);
8080
});
8181

8282
test('should subscribe by multiple keys and be triggered correctly', () => {
@@ -92,20 +92,20 @@ describe('ReSubstitute', () => {
9292
resub.subscribe(onKey2TriggerMock, 'testKey2');
9393
resub.subscribe(onKey3TriggerMock, 'testKey3');
9494

95-
expect(onTriggerMock).toBeCalledTimes(0);
96-
expect(onKeyTriggerMock).toBeCalledTimes(0);
97-
expect(onKey2TriggerMock).toBeCalledTimes(0);
98-
expect(onKey3TriggerMock).toBeCalledTimes(0);
95+
expect(onTriggerMock).toHaveBeenCalledTimes(0);
96+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(0);
97+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(0);
98+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
9999
resub.trigger();
100-
expect(onTriggerMock).toBeCalledTimes(1);
101-
expect(onKeyTriggerMock).toBeCalledTimes(0);
102-
expect(onKey2TriggerMock).toBeCalledTimes(0);
103-
expect(onKey3TriggerMock).toBeCalledTimes(0);
100+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
101+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(0);
102+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(0);
103+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
104104
resub.trigger(['testKey', 'testKey2']);
105-
expect(onTriggerMock).toBeCalledTimes(1);
106-
expect(onKeyTriggerMock).toBeCalledTimes(1);
107-
expect(onKey2TriggerMock).toBeCalledTimes(1);
108-
expect(onKey3TriggerMock).toBeCalledTimes(0);
105+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
106+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(1);
107+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(1);
108+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
109109
});
110110

111111
test('should subscribe by multiple keys and be able to delay triggers correctly', () => {
@@ -121,46 +121,46 @@ describe('ReSubstitute', () => {
121121
resubThrottled.subscribe(onKey2TriggerMock, 'testKey2');
122122
resubThrottled.subscribe(onKey3TriggerMock, 'testKey3');
123123

124-
expect(onTriggerMock).toBeCalledTimes(0);
125-
expect(onKeyTriggerMock).toBeCalledTimes(0);
126-
expect(onKey2TriggerMock).toBeCalledTimes(0);
127-
expect(onKey3TriggerMock).toBeCalledTimes(0);
124+
expect(onTriggerMock).toHaveBeenCalledTimes(0);
125+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(0);
126+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(0);
127+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
128128
resubThrottled.trigger();
129129
resubThrottled.trigger();
130-
expect(onTriggerMock).toBeCalledTimes(0);
131-
expect(onKeyTriggerMock).toBeCalledTimes(0);
132-
expect(onKey2TriggerMock).toBeCalledTimes(0);
133-
expect(onKey3TriggerMock).toBeCalledTimes(0);
130+
expect(onTriggerMock).toHaveBeenCalledTimes(0);
131+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(0);
132+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(0);
133+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
134134

135135
jest.advanceTimersByTime(1000);
136-
expect(onTriggerMock).toBeCalledTimes(1);
137-
expect(onKeyTriggerMock).toBeCalledTimes(0);
138-
expect(onKey2TriggerMock).toBeCalledTimes(0);
139-
expect(onKey3TriggerMock).toBeCalledTimes(0);
136+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
137+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(0);
138+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(0);
139+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
140140

141141
resubThrottled.trigger(['testKey', 'testKey2']);
142142
resubThrottled.trigger(['testKey', 'testKey2']);
143-
expect(onTriggerMock).toBeCalledTimes(1);
144-
expect(onKeyTriggerMock).toBeCalledTimes(0);
145-
expect(onKey2TriggerMock).toBeCalledTimes(0);
146-
expect(onKey3TriggerMock).toBeCalledTimes(0);
143+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
144+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(0);
145+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(0);
146+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
147147

148148
jest.advanceTimersByTime(1000);
149-
expect(onTriggerMock).toBeCalledTimes(1);
150-
expect(onKeyTriggerMock).toBeCalledTimes(1);
151-
expect(onKey2TriggerMock).toBeCalledTimes(1);
152-
expect(onKey3TriggerMock).toBeCalledTimes(0);
149+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
150+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(1);
151+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(1);
152+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
153153

154154
resubThrottled.trigger('testKey3');
155-
expect(onTriggerMock).toBeCalledTimes(1);
156-
expect(onKeyTriggerMock).toBeCalledTimes(1);
157-
expect(onKey2TriggerMock).toBeCalledTimes(1);
158-
expect(onKey3TriggerMock).toBeCalledTimes(0);
155+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
156+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(1);
157+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(1);
158+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(0);
159159

160160
jest.advanceTimersByTime(1000);
161-
expect(onTriggerMock).toBeCalledTimes(1);
162-
expect(onKeyTriggerMock).toBeCalledTimes(1);
163-
expect(onKey2TriggerMock).toBeCalledTimes(1);
164-
expect(onKey3TriggerMock).toBeCalledTimes(1);
161+
expect(onTriggerMock).toHaveBeenCalledTimes(1);
162+
expect(onKeyTriggerMock).toHaveBeenCalledTimes(1);
163+
expect(onKey2TriggerMock).toHaveBeenCalledTimes(1);
164+
expect(onKey3TriggerMock).toHaveBeenCalledTimes(1);
165165
});
166166
});

0 commit comments

Comments
 (0)