Skip to content

Commit 1ec6f9e

Browse files
committed
test: fix tests
1 parent 16f61c9 commit 1ec6f9e

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
"babel-register": "^6.23.0",
8686
"babel-runtime": "^6.23.0",
8787
"chai": "^4.1.2",
88+
"chai-subset": "^1.6.0",
8889
"codecov": "^3.0.0",
8990
"copy": "^0.3.0",
9091
"enzyme": "^3.3.0",

test/configure.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
import chai from 'chai'
2+
import chaiSubset from 'chai-subset'
13
import { before } from 'mocha'
24
import { configure } from 'enzyme'
35
import Adapter from 'enzyme-adapter-react-16'
6+
7+
chai.use(chaiSubset)
48
configure({ adapter: new Adapter() })
59

610
/* eslint-env node */

test/index.js

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('ScriptLoader', () => {
2828
</ScriptLoader>
2929
)
3030
expect(comp.text()).to.equal('hello')
31-
expect(render.args[0][0]).to.deep.equal({
31+
expect(render.lastCall.lastArg).to.containSubset({
3232
loading: true,
3333
loaded: false,
3434
error: undefined,
@@ -37,7 +37,7 @@ describe('ScriptLoader', () => {
3737
if (!script) throw new Error('failed to get script');
3838
(script: any).onload()
3939
await promise
40-
expect(render.args[1][0]).to.deep.equal({
40+
expect(render.lastCall.lastArg).to.containSubset({
4141
loading: false,
4242
loaded: true,
4343
error: null,
@@ -57,7 +57,7 @@ describe('ScriptLoader', () => {
5757
</ScriptLoader>
5858
)
5959
expect(comp.text()).to.equal('hello')
60-
expect(render.args[0][0]).to.deep.equal({
60+
expect(render.lastCall.lastArg).to.containSubset({
6161
loading: true,
6262
loaded: false,
6363
error: undefined,
@@ -66,7 +66,7 @@ describe('ScriptLoader', () => {
6666
if (!script) throw new Error('failed to get script');
6767
(script: any).onerror()
6868
await promise.catch(() => {})
69-
const arg1 = render.args[1][0]
69+
const arg1 = render.lastCall.lastArg
7070
expect(arg1.loading).to.be.false
7171
expect(arg1.loaded).to.be.false
7272
expect(arg1.error).to.be.an.instanceOf(Error)
@@ -89,15 +89,15 @@ describe('ScriptLoader', () => {
8989
</ScriptLoader>
9090
)
9191
expect(comp.text()).to.equal('hello')
92-
expect(render.args[0][0]).to.deep.equal({
92+
expect(render.lastCall.lastArg).to.containSubset({
9393
loading: true,
9494
loaded: false,
9595
error: undefined,
9696
})
9797
const script = document.getElementById('scriptId')
9898
if (script) throw new Error('duplicate script found')
9999
await promise.catch(() => {})
100-
const arg1 = render.args[1][0]
100+
const arg1 = render.lastCall.lastArg
101101
expect(arg1.loading).to.be.false
102102
expect(arg1.loaded).to.be.true
103103
expect(arg1.error).to.be.null
@@ -122,7 +122,7 @@ describe('ScriptLoader', () => {
122122
{render}
123123
</ScriptLoader>
124124
).props).update()
125-
expect(render.args[0][0]).to.deep.equal({
125+
expect(render.lastCall.lastArg).to.containSubset({
126126
loading: true,
127127
loaded: false,
128128
error: undefined,
@@ -135,12 +135,7 @@ describe('ScriptLoader', () => {
135135
(script2: any).onload()
136136
await promise.catch(() => {})
137137
expect(oldOnLoad.called).to.be.false
138-
expect(render.args[1][0]).to.deep.equal({
139-
loading: true,
140-
loaded: false,
141-
error: undefined,
142-
})
143-
expect(render.args[2][0]).to.deep.equal({
138+
expect(render.lastCall.lastArg).to.containSubset({
144139
loading: false,
145140
loaded: true,
146141
error: null,
@@ -166,7 +161,7 @@ describe('ScriptLoader', () => {
166161
{render}
167162
</ScriptLoader>
168163
).props).update()
169-
expect(render.args[0][0]).to.deep.equal({
164+
expect(render.lastCall.lastArg).to.containSubset({
170165
loading: true,
171166
loaded: false,
172167
error: undefined,
@@ -179,12 +174,7 @@ describe('ScriptLoader', () => {
179174
(script2: any).onload()
180175
await promise.catch(() => {})
181176
expect(oldOnError.called).to.be.false
182-
expect(render.args[1][0]).to.deep.equal({
183-
loading: true,
184-
loaded: false,
185-
error: undefined,
186-
})
187-
expect(render.args[2][0]).to.deep.equal({
177+
expect(render.lastCall.lastArg).to.containSubset({
188178
loading: false,
189179
loaded: true,
190180
error: null,

yarn.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,6 +1549,10 @@ center-align@^0.1.1:
15491549
align-text "^0.1.3"
15501550
lazy-cache "^1.0.3"
15511551

1552+
chai-subset@^1.6.0:
1553+
version "1.6.0"
1554+
resolved "https://registry.npmjs.org/chai-subset/-/chai-subset-1.6.0.tgz#a5d0ca14e329a79596ed70058b6646bd6988cfe9"
1555+
15521556
chai@^4.1.2:
15531557
version "4.1.2"
15541558
resolved "https://registry.npmjs.org/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"

0 commit comments

Comments
 (0)