Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit 399b863

Browse files
zimbabaojasonLaster
authored andcommitted
Use jest assertion in place of expect (#3003)
Migrate all test using expect assertions to jest Delete mocha-runner.html Fixes: #2995
1 parent 61c79fa commit 399b863

File tree

18 files changed

+389
-410
lines changed

18 files changed

+389
-410
lines changed

src/actions/tests/breakpoints.js

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import expect from "expect.js";
2-
31
import { createStore, selectors, actions } from "../../utils/test-head";
42
import {
53
simulateCorrectThreadClient,
@@ -14,8 +12,8 @@ describe("breakpoints", () => {
1412
await dispatch(actions.addBreakpoint(loc1));
1513
const bps = selectors.getBreakpoints(getState());
1614
const bp = selectors.getBreakpoint(getState(), loc1);
17-
expect(bps.size).to.be(1);
18-
expect(bp.location).to.eql(loc1);
15+
expect(bps.size).toBe(1);
16+
expect(bp.location).toEqual(loc1);
1917
});
2018

2119
it("should not re-add a breakpoint", async () => {
@@ -25,12 +23,12 @@ describe("breakpoints", () => {
2523
await dispatch(actions.addBreakpoint(loc1));
2624
let bps = selectors.getBreakpoints(getState());
2725
const bp = selectors.getBreakpoint(getState(), loc1);
28-
expect(bps.size).to.be(1);
29-
expect(bp.location).to.eql(loc1);
26+
expect(bps.size).toBe(1);
27+
expect(bp.location).toEqual(loc1);
3028

3129
await dispatch(actions.addBreakpoint(loc1));
3230
bps = selectors.getBreakpoints(getState());
33-
expect(bps.size).to.be(1);
31+
expect(bps.size).toBe(1);
3432
});
3533

3634
describe("adding a breakpoint to an invalid location", async () => {
@@ -46,8 +44,8 @@ describe("breakpoints", () => {
4644
const state = getState();
4745
const bps = selectors.getBreakpoints(state);
4846
const bp = selectors.getBreakpoint(state, correctedLocation);
49-
expect(bps.size).to.be(1);
50-
expect(bp.location).to.eql(correctedLocation);
47+
expect(bps.size).toBe(1);
48+
expect(bp.location).toEqual(correctedLocation);
5149
});
5250
});
5351

@@ -62,7 +60,7 @@ describe("breakpoints", () => {
6260

6361
await dispatch(actions.removeBreakpoint(loc1));
6462

65-
expect(selectors.getBreakpoints(getState()).size).to.be(1);
63+
expect(selectors.getBreakpoints(getState()).size).toBe(1);
6664
});
6765

6866
it("should disable a breakpoint", async () => {
@@ -76,7 +74,7 @@ describe("breakpoints", () => {
7674

7775
await dispatch(actions.disableBreakpoint(loc1));
7876

79-
expect(selectors.getBreakpoint(getState(), loc1).disabled).to.be(true);
77+
expect(selectors.getBreakpoint(getState(), loc1).disabled).toBe(true);
8078
});
8179

8280
it("should enable breakpoint", async () => {
@@ -86,11 +84,11 @@ describe("breakpoints", () => {
8684
await dispatch(actions.addBreakpoint(loc));
8785
await dispatch(actions.disableBreakpoint(loc));
8886

89-
expect(selectors.getBreakpoint(getState(), loc).disabled).to.be(true);
87+
expect(selectors.getBreakpoint(getState(), loc).disabled).toBe(true);
9088

9189
await dispatch(actions.enableBreakpoint(loc));
9290

93-
expect(selectors.getBreakpoint(getState(), loc).disabled).to.be(false);
91+
expect(selectors.getBreakpoint(getState(), loc).disabled).toBe(false);
9492
});
9593

9694
it("should toggle all the breakpoints", async () => {
@@ -104,13 +102,13 @@ describe("breakpoints", () => {
104102

105103
await dispatch(actions.toggleAllBreakpoints(true));
106104

107-
expect(selectors.getBreakpoint(getState(), loc1).disabled).to.be(true);
108-
expect(selectors.getBreakpoint(getState(), loc2).disabled).to.be(true);
105+
expect(selectors.getBreakpoint(getState(), loc1).disabled).toBe(true);
106+
expect(selectors.getBreakpoint(getState(), loc2).disabled).toBe(true);
109107

110108
await dispatch(actions.toggleAllBreakpoints());
111109

112-
expect(selectors.getBreakpoint(getState(), loc1).disabled).to.be(false);
113-
expect(selectors.getBreakpoint(getState(), loc2).disabled).to.be(false);
110+
expect(selectors.getBreakpoint(getState(), loc1).disabled).toBe(false);
111+
expect(selectors.getBreakpoint(getState(), loc2).disabled).toBe(false);
114112
});
115113

116114
it("should set the breakpoint condition", async () => {
@@ -120,7 +118,7 @@ describe("breakpoints", () => {
120118

121119
await dispatch(actions.addBreakpoint(loc));
122120

123-
expect(selectors.getBreakpoint(getState(), loc).condition).to.be(null);
121+
expect(selectors.getBreakpoint(getState(), loc).condition).toBe(null);
124122

125123
await dispatch(
126124
actions.setBreakpointCondition(loc, {
@@ -129,7 +127,7 @@ describe("breakpoints", () => {
129127
})
130128
);
131129

132-
expect(selectors.getBreakpoint(getState(), loc).condition).to.be(
130+
expect(selectors.getBreakpoint(getState(), loc).condition).toBe(
133131
"const foo = 0"
134132
);
135133
});

src/actions/tests/expressions.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import expect from "expect.js";
21
import { actions, selectors, createStore } from "../../utils/test-head";
32

43
const mockThreadClient = {
@@ -20,8 +19,8 @@ describe("expressions", () => {
2019
dispatch(actions.addExpression("foo"));
2120
dispatch(actions.addExpression("bar", { visible: false }));
2221

23-
expect(selectors.getExpressions(getState()).size).to.be(2);
24-
expect(selectors.getVisibleExpressions(getState()).size).to.be(1);
22+
expect(selectors.getExpressions(getState()).size).toBe(2);
23+
expect(selectors.getVisibleExpressions(getState()).size).toBe(1);
2524
});
2625

2726
it("should update an expression", () => {
@@ -31,7 +30,7 @@ describe("expressions", () => {
3130
const expression = selectors.getExpression(getState(), "foo");
3231
dispatch(actions.updateExpression("bar", expression));
3332

34-
expect(selectors.getExpression(getState(), "bar").input).to.be("bar");
33+
expect(selectors.getExpression(getState(), "bar").input).toBe("bar");
3534
});
3635

3736
it("should delete an expression", () => {
@@ -40,13 +39,13 @@ describe("expressions", () => {
4039
dispatch(actions.addExpression("foo"));
4140
dispatch(actions.addExpression("bar", { visible: false }));
4241

43-
expect(selectors.getExpressions(getState()).size).to.be(2);
42+
expect(selectors.getExpressions(getState()).size).toBe(2);
4443

4544
const expression = selectors.getExpression(getState(), "foo");
4645
dispatch(actions.deleteExpression(expression));
4746

48-
expect(selectors.getExpressions(getState()).size).to.be(1);
49-
expect(selectors.getExpression(getState(), "bar").input).to.be("bar");
47+
expect(selectors.getExpressions(getState()).size).toBe(1);
48+
expect(selectors.getExpression(getState(), "bar").input).toBe("bar");
5049
});
5150

5251
it("should evaluate expressions global scope", async () => {
@@ -55,12 +54,12 @@ describe("expressions", () => {
5554
dispatch(actions.addExpression("foo"));
5655
dispatch(actions.addExpression("bar", { visible: false }));
5756

58-
expect(selectors.getExpression(getState(), "foo").value).to.be(null);
59-
expect(selectors.getExpression(getState(), "bar").value).to.be(null);
57+
expect(selectors.getExpression(getState(), "foo").value).toBe(null);
58+
expect(selectors.getExpression(getState(), "bar").value).toBe(null);
6059
await dispatch(actions.evaluateExpressions());
6160

62-
expect(selectors.getExpression(getState(), "foo").value).to.be("bla");
63-
expect(selectors.getExpression(getState(), "bar").value).to.be("bla");
61+
expect(selectors.getExpression(getState(), "foo").value).toBe("bla");
62+
expect(selectors.getExpression(getState(), "bar").value).toBe("bla");
6463
});
6564

6665
it("should evaluate expressions in specific scope", async () => {
@@ -69,11 +68,11 @@ describe("expressions", () => {
6968
dispatch(actions.addExpression("foo"));
7069
dispatch(actions.addExpression("bar", { visible: false }));
7170

72-
expect(selectors.getExpression(getState(), "foo").value).to.be(null);
73-
expect(selectors.getExpression(getState(), "bar").value).to.be(null);
71+
expect(selectors.getExpression(getState(), "foo").value).toBe(null);
72+
expect(selectors.getExpression(getState(), "bar").value).toBe(null);
7473
await dispatch(actions.evaluateExpressions("boo"));
7574

76-
expect(selectors.getExpression(getState(), "foo").value).to.be("boo");
77-
expect(selectors.getExpression(getState(), "bar").value).to.be("boo");
75+
expect(selectors.getExpression(getState(), "foo").value).toBe("boo");
76+
expect(selectors.getExpression(getState(), "bar").value).toBe("boo");
7877
});
7978
});

src/actions/tests/pending-breakpoints.js

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
makeSource
3333
} from "../../utils/test-head";
3434
import { makePendingLocationId } from "../../reducers/breakpoints";
35-
import expect from "expect.js";
3635

3736
describe("when adding breakpoints", () => {
3837
it("a corresponding pending breakpoint should be added", async () => {
@@ -42,8 +41,8 @@ describe("when adding breakpoints", () => {
4241

4342
await dispatch(actions.addBreakpoint(bp.location));
4443
const pendingBps = selectors.getPendingBreakpoints(getState());
45-
expect(pendingBps.size).to.be(2);
46-
expect(pendingBps.get(id)).to.eql(generatePendingBreakpoint(bp));
44+
expect(pendingBps.size).toBe(2);
45+
expect(pendingBps.get(id)).toEqual(generatePendingBreakpoint(bp));
4746
});
4847

4948
describe("adding and deleting breakpoints", () => {
@@ -65,10 +64,10 @@ describe("when adding breakpoints", () => {
6564
await dispatch(actions.addBreakpoint(breakpoint2.location));
6665

6766
const pendingBps = selectors.getPendingBreakpoints(getState());
68-
expect(pendingBps.get(breakpointLocationId1)).to.eql(
67+
expect(pendingBps.get(breakpointLocationId1)).toEqual(
6968
generatePendingBreakpoint(breakpoint1)
7069
);
71-
expect(pendingBps.get(breakpointLocationId2)).to.eql(
70+
expect(pendingBps.get(breakpointLocationId2)).toEqual(
7271
generatePendingBreakpoint(breakpoint2)
7372
);
7473
});
@@ -80,8 +79,8 @@ describe("when adding breakpoints", () => {
8079
await dispatch(actions.removeBreakpoint(breakpoint1.location));
8180

8281
const pendingBps = selectors.getPendingBreakpoints(getState());
83-
expect(pendingBps.has(breakpointLocationId1)).not.to.be(true);
84-
expect(pendingBps.has(breakpointLocationId2)).to.be(true);
82+
expect(pendingBps.has(breakpointLocationId1)).not.toBe(true);
83+
expect(pendingBps.has(breakpointLocationId2)).toBe(true);
8584
});
8685
});
8786
});
@@ -98,7 +97,7 @@ describe("when changing an existing breakpoint", () => {
9897
);
9998
const bps = selectors.getPendingBreakpoints(getState());
10099
const breakpoint = bps.get(id);
101-
expect(breakpoint.condition).to.be("2");
100+
expect(breakpoint.condition).toBe("2");
102101
});
103102

104103
it("if disabled, updates corresponding pendingBreakpoint", async () => {
@@ -110,7 +109,7 @@ describe("when changing an existing breakpoint", () => {
110109
await dispatch(actions.disableBreakpoint(bp.location));
111110
const bps = selectors.getPendingBreakpoints(getState());
112111
const breakpoint = bps.get(id);
113-
expect(breakpoint.disabled).to.be(true);
112+
expect(breakpoint.disabled).toBe(true);
114113
});
115114

116115
it("does not delete the pre-existing pendingBreakpoint", async () => {
@@ -124,7 +123,7 @@ describe("when changing an existing breakpoint", () => {
124123
);
125124
const bps = selectors.getPendingBreakpoints(getState());
126125
const breakpoint = bps.get(id);
127-
expect(breakpoint.condition).to.be("2");
126+
expect(breakpoint.condition).toBe("2");
128127
});
129128
});
130129

@@ -134,7 +133,7 @@ describe("initializing when pending breakpoints exist in perfs", () => {
134133
const id = makePendingLocationId(theMockedPendingBreakpoint.location);
135134
const bps = selectors.getPendingBreakpoints(getState());
136135
const bp = bps.get(id);
137-
expect(bp).to.eql(generatePendingBreakpoint(theMockedPendingBreakpoint));
136+
expect(bp).toEqual(generatePendingBreakpoint(theMockedPendingBreakpoint));
138137
});
139138

140139
it("readding breakpoints update existing pending breakpoints", async () => {
@@ -144,7 +143,7 @@ describe("initializing when pending breakpoints exist in perfs", () => {
144143
await dispatch(actions.addBreakpoint(bar.location));
145144

146145
const bps = selectors.getPendingBreakpoints(getState());
147-
expect(bps.size).to.be(1);
146+
expect(bps.size).toBe(1);
148147
});
149148

150149
it("adding bps doesn't remove existing pending breakpoints", async () => {
@@ -154,7 +153,7 @@ describe("initializing when pending breakpoints exist in perfs", () => {
154153
await dispatch(actions.addBreakpoint(bp.location));
155154

156155
const bps = selectors.getPendingBreakpoints(getState());
157-
expect(bps.size).to.be(2);
156+
expect(bps.size).toBe(2);
158157
});
159158
});
160159

@@ -163,25 +162,25 @@ describe("adding sources", () => {
163162
const { dispatch, getState } = createStore(simpleMockThreadClient);
164163

165164
let bps = selectors.getBreakpoints(getState());
166-
expect(bps.size).to.be(0);
165+
expect(bps.size).toBe(0);
167166

168167
const source = makeSource("bar.js");
169168
await dispatch(actions.newSource(source));
170169
bps = selectors.getBreakpoints(getState());
171-
expect(bps.size).to.be(1);
170+
expect(bps.size).toBe(1);
172171
});
173172

174173
it("add corresponding breakpoints for multiple sources", async () => {
175174
const { dispatch, getState } = createStore(simpleMockThreadClient);
176175

177176
let bps = selectors.getBreakpoints(getState());
178-
expect(bps.size).to.be(0);
177+
expect(bps.size).toBe(0);
179178

180179
const source1 = makeSource("bar.js");
181180
const source2 = makeSource("foo.js");
182181
await dispatch(actions.newSources([source1, source2]));
183182
bps = selectors.getBreakpoints(getState());
184-
expect(bps.size).to.be(1);
183+
expect(bps.size).toBe(1);
185184
});
186185
});
187186

@@ -201,6 +200,6 @@ describe("invalid breakpoint location", () => {
201200
await dispatch(actions.addBreakpoint(bp.location));
202201
const pendingBps = selectors.getPendingBreakpoints(getState());
203202
const pendingBp = pendingBps.get(correctedPendingId);
204-
expect(pendingBp).to.eql(generatePendingBreakpoint(slidBp));
203+
expect(pendingBp).toEqual(generatePendingBreakpoint(slidBp));
205204
});
206205
});

0 commit comments

Comments
 (0)