Skip to content

Commit 724db30

Browse files
committed
test: Remove shouldjs dependency
1 parent e36bc24 commit 724db30

17 files changed

+131
-198
lines changed

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"irc-replies": "^2.0.1",
2626
"microbundle": "^0.15",
2727
"prettier": "^3",
28-
"should": "^13.2.3",
2928
"vitest": "^2.1.2"
3029
},
3130
"scripts": {

test/away.test.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,8 +9,8 @@ it('should emit "away"', () =>
109
var client = irc(stream)
1110

1211
client.on('away', function (e) {
13-
e.nick.should.equal('colinm')
14-
e.message.should.eql('brb food time')
12+
expect(e.nick).toStrictEqual('colinm')
13+
expect(e.message).toStrictEqual('brb food time')
1514
done()
1615
})
1716

test/invite.test.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,13 +9,13 @@ it('should emit "invite"', () =>
109
var client = irc(stream)
1110

1211
client.on('invite', function (e) {
13-
e.from.should.equal('test')
14-
e.to.should.equal('astranger')
15-
e.channel.should.equal('#something')
16-
e.hostmask.nick.should.equal('test')
17-
e.hostmask.username.should.equal('~user')
18-
e.hostmask.hostname.should.equal('example.com')
19-
e.hostmask.string.should.equal('test!~user@example.com')
12+
expect(e.from).toStrictEqual('test')
13+
expect(e.to).toStrictEqual('astranger')
14+
expect(e.channel).toStrictEqual('#something')
15+
expect(e.hostmask.nick).toStrictEqual('test')
16+
expect(e.hostmask.username).toStrictEqual('~user')
17+
expect(e.hostmask.hostname).toStrictEqual('example.com')
18+
expect(e.hostmask.string).toStrictEqual('test!~user@example.com')
2019
done()
2120
})
2221

test/join.test.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,12 +9,14 @@ it('should emit "join"', () =>
109
var client = irc(stream)
1110

1211
client.on('join', function (e) {
13-
e.nick.should.equal('tjholowaychuk')
14-
e.channel.should.equal('#express')
15-
e.hostmask.nick.should.equal('tjholowaychuk')
16-
e.hostmask.username.should.equal('~tjholoway')
17-
e.hostmask.hostname.should.equal('S01067cb21b2fd643.gv.shawcable.net')
18-
e.hostmask.string.should.equal(
12+
expect(e.nick).toStrictEqual('tjholowaychuk')
13+
expect(e.channel).toStrictEqual('#express')
14+
expect(e.hostmask.nick).toStrictEqual('tjholowaychuk')
15+
expect(e.hostmask.username).toStrictEqual('~tjholoway')
16+
expect(e.hostmask.hostname).toStrictEqual(
17+
'S01067cb21b2fd643.gv.shawcable.net',
18+
)
19+
expect(e.hostmask.string).toStrictEqual(
1920
'tjholowaychuk!~tjholoway@S01067cb21b2fd643.gv.shawcable.net',
2021
)
2122
done()

test/kick.test.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,13 +9,15 @@ it('should emit "kick"', () =>
109
var client = irc(stream)
1110

1211
client.on('kick', function (e) {
13-
e.nick.should.equal('tjholowaychuk')
14-
e.client.should.equal('tobi')
15-
e.channel.should.eql('#express')
16-
e.hostmask.nick.should.equal('tjholowaychuk')
17-
e.hostmask.username.should.equal('~tjholoway')
18-
e.hostmask.hostname.should.equal('S01067cb21b2fd643.gv.shawcable.net')
19-
e.hostmask.string.should.equal(
12+
expect(e.nick).toStrictEqual('tjholowaychuk')
13+
expect(e.client).toStrictEqual('tobi')
14+
expect(e.channel).toStrictEqual('#express')
15+
expect(e.hostmask.nick).toStrictEqual('tjholowaychuk')
16+
expect(e.hostmask.username).toStrictEqual('~tjholoway')
17+
expect(e.hostmask.hostname).toStrictEqual(
18+
'S01067cb21b2fd643.gv.shawcable.net',
19+
)
20+
expect(e.hostmask.string).toStrictEqual(
2021
'tjholowaychuk!~tjholoway@S01067cb21b2fd643.gv.shawcable.net',
2122
)
2223
done()

test/names.test.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -11,7 +10,7 @@ it('should respond with user names', () =>
1110

1211
client.names('#luna-lang', function (err, names) {
1312
if (err) return done(err)
14-
names.should.eql([
13+
expect(names).toStrictEqual([
1514
{ name: 'owner', mode: '~' },
1615
{ name: 'foo', mode: '@' },
1716
{ name: 'halfop', mode: '%' },
@@ -42,8 +41,8 @@ it('should emit "names"', () =>
4241
var client = irc(stream)
4342

4443
client.on('names', function (e) {
45-
e.channel.should.equal('#luna-lang')
46-
e.names.should.eql([
44+
expect(e.channel).toStrictEqual('#luna-lang')
45+
expect(e.names).toStrictEqual([
4746
{ name: 'one', mode: '' },
4847
{ name: 'two', mode: '~' },
4948
{ name: 'three', mode: '' },
@@ -72,8 +71,8 @@ it('should retain ~ / @ / % / +', () =>
7271
var client = irc(stream)
7372

7473
client.on('names', function (e) {
75-
e.channel.should.equal('##luna-lang')
76-
e.names.should.eql([
74+
expect(e.channel).toStrictEqual('##luna-lang')
75+
expect(e.names).toStrictEqual([
7776
{ name: 'owner', mode: '~' },
7877
{ name: 'tjholowaychuk', mode: '@' },
7978
{ name: 'halfop', mode: '%' },

test/nick.test.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,12 +9,12 @@ it('should emit "nick"', () =>
109
var client = irc(stream)
1110

1211
client.on('nick', function (e) {
13-
e.nick.should.eql('colinm')
14-
e.new.should.equal('cmilhench')
15-
e.hostmask.nick.should.equal('colinm')
16-
e.hostmask.username.should.equal('~colinm')
17-
e.hostmask.hostname.should.equal('host-92-17-247-88.as13285.net')
18-
e.hostmask.string.should.equal(
12+
expect(e.nick).toStrictEqual('colinm')
13+
expect(e.new).toStrictEqual('cmilhench')
14+
expect(e.hostmask.nick).toStrictEqual('colinm')
15+
expect(e.hostmask.username).toStrictEqual('~colinm')
16+
expect(e.hostmask.hostname).toStrictEqual('host-92-17-247-88.as13285.net')
17+
expect(e.hostmask.string).toStrictEqual(
1918
'colinm!~colinm@host-92-17-247-88.as13285.net',
2019
)
2120
done()

test/notice.test.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -11,15 +10,15 @@ it('should emit "notice"', () =>
1110
var n = 0
1211

1312
client.on('notice', function (e) {
14-
e.from.should.equal('NickServ')
15-
e.to.should.equal('cmilhench')
16-
e.hostmask.nick.should.equal('NickServ')
17-
e.hostmask.username.should.equal('NickServ')
18-
e.hostmask.hostname.should.equal('services.')
19-
e.hostmask.string.should.equal('NickServ!NickServ@services.')
13+
expect(e.from).toStrictEqual('NickServ')
14+
expect(e.to).toStrictEqual('cmilhench')
15+
expect(e.hostmask.nick).toStrictEqual('NickServ')
16+
expect(e.hostmask.username).toStrictEqual('NickServ')
17+
expect(e.hostmask.hostname).toStrictEqual('services.')
18+
expect(e.hostmask.string).toStrictEqual('NickServ!NickServ@services.')
2019
switch (++n) {
2120
case 1:
22-
e.message.should.equal(
21+
expect(e.message).toStrictEqual(
2322
[
2423
'This nickname is registered. ',
2524
'Please choose a different nickname, ',
@@ -28,7 +27,7 @@ it('should emit "notice"', () =>
2827
)
2928
break
3029
case 2:
31-
e.message.should.equal(
30+
expect(e.message).toStrictEqual(
3231
[
3332
'You have 30 seconds to identify to your nickname ',
3433
'before it is changed.',

test/part.test.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,13 +9,15 @@ it('should emit "part"', () =>
109
var client = irc(stream)
1110

1211
client.on('part', function (e) {
13-
e.nick.should.equal('tjholowaychuk')
14-
e.channels.should.eql(['#express'])
15-
e.message.should.equal('So long!')
16-
e.hostmask.nick.should.equal('tjholowaychuk')
17-
e.hostmask.username.should.equal('~tjholoway')
18-
e.hostmask.hostname.should.equal('S01067cb21b2fd643.gv.shawcable.net')
19-
e.hostmask.string.should.equal(
12+
expect(e.nick).toStrictEqual('tjholowaychuk')
13+
expect(e.channels).toStrictEqual(['#express'])
14+
expect(e.message).toStrictEqual('So long!')
15+
expect(e.hostmask.nick).toStrictEqual('tjholowaychuk')
16+
expect(e.hostmask.username).toStrictEqual('~tjholoway')
17+
expect(e.hostmask.hostname).toStrictEqual(
18+
'S01067cb21b2fd643.gv.shawcable.net',
19+
)
20+
expect(e.hostmask.string).toStrictEqual(
2021
'tjholowaychuk!~tjholoway@S01067cb21b2fd643.gv.shawcable.net',
2122
)
2223
done()

test/pong.test.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -13,10 +12,10 @@ it('should respond with PONG', () =>
1312
stream.on('data', function (chunk) {
1413
switch (n++) {
1514
case 0:
16-
chunk.should.equal('PING :rothfuss.freenode.net\r\n')
15+
expect(chunk).toStrictEqual('PING :rothfuss.freenode.net\r\n')
1716
break
1817
case 1:
19-
chunk.should.equal('PONG :rothfuss.freenode.net\r\n')
18+
expect(chunk).toStrictEqual('PONG :rothfuss.freenode.net\r\n')
2019
done()
2120
break
2221
}

test/privmsg.test.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,13 +9,13 @@ it('should emit "message"', () =>
109
var client = irc(stream)
1110

1211
client.on('message', function (e) {
13-
e.from.should.equal('tobi')
14-
e.to.should.equal('loki')
15-
e.message.should.equal('Hello :)')
16-
e.hostmask.nick.should.equal('tobi')
17-
e.hostmask.username.should.equal('~user')
18-
e.hostmask.hostname.should.equal('example.com')
19-
e.hostmask.string.should.equal('tobi!~user@example.com')
12+
expect(e.from).toStrictEqual('tobi')
13+
expect(e.to).toStrictEqual('loki')
14+
expect(e.message).toStrictEqual('Hello :)')
15+
expect(e.hostmask.nick).toStrictEqual('tobi')
16+
expect(e.hostmask.username).toStrictEqual('~user')
17+
expect(e.hostmask.hostname).toStrictEqual('example.com')
18+
expect(e.hostmask.string).toStrictEqual('tobi!~user@example.com')
2019
done()
2120
})
2221

test/quit.test.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,14 +9,14 @@ it('should emit "quit"', () =>
109
var client = irc(stream)
1110

1211
client.on('quit', function (e) {
13-
e.nick.should.equal('tobi')
14-
e.message.should.eql('Remote host closed the connection')
15-
e.hostmask.nick.should.equal('tobi')
16-
e.hostmask.username.should.equal('~tobi')
17-
e.hostmask.hostname.should.equal(
12+
expect(e.nick).toStrictEqual('tobi')
13+
expect(e.message).toStrictEqual('Remote host closed the connection')
14+
expect(e.hostmask.nick).toStrictEqual('tobi')
15+
expect(e.hostmask.username).toStrictEqual('~tobi')
16+
expect(e.hostmask.hostname).toStrictEqual(
1817
'107-214-168-243.lightspeed.cicril.sbcglobal.net',
1918
)
20-
e.hostmask.string.should.equal(
19+
expect(e.hostmask.string).toStrictEqual(
2120
'tobi!~tobi@107-214-168-243.lightspeed.cicril.sbcglobal.net',
2221
)
2322
done()

test/topic.test.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -10,13 +9,13 @@ it('should emit "topic"', () =>
109
var client = irc(stream)
1110

1211
client.on('topic', function (e) {
13-
e.nick.should.equal('tobi')
14-
e.channel.should.eql('#slate')
15-
e.topic.should.equal('Slate 1.0 is out!')
16-
e.hostmask.nick.should.equal('tobi')
17-
e.hostmask.username.should.equal('~user')
18-
e.hostmask.hostname.should.equal('example.com')
19-
e.hostmask.string.should.equal('tobi!~user@example.com')
12+
expect(e.nick).toStrictEqual('tobi')
13+
expect(e.channel).toStrictEqual('#slate')
14+
expect(e.topic).toStrictEqual('Slate 1.0 is out!')
15+
expect(e.hostmask.nick).toStrictEqual('tobi')
16+
expect(e.hostmask.username).toStrictEqual('~user')
17+
expect(e.hostmask.hostname).toStrictEqual('example.com')
18+
expect(e.hostmask.string).toStrictEqual('tobi!~user@example.com')
2019
done()
2120
})
2221

test/welcome.test.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { it } from 'vitest'
2-
import 'should'
1+
import { expect, it } from 'vitest'
32

43
import irc from '..'
54
import { PassThrough as Stream } from 'stream'
@@ -11,7 +10,7 @@ it('should set client.me to the users nick', () => {
1110
':cameron.freenode.net 001 tobi :Welcome to the freenode Internet Relay Chat Network tobi\r\n',
1211
)
1312
process.nextTick(() => {
14-
client.me.should.equal('tobi')
13+
expect(client.me).toStrictEqual('tobi')
1514
})
1615
})
1716

@@ -21,7 +20,7 @@ it('should emit "welcome"', () =>
2120
var client = irc(stream)
2221

2322
client.on('welcome', function (nick) {
24-
nick.should.equal('tobi')
23+
expect(nick).toStrictEqual('tobi')
2524
done()
2625
})
2726

0 commit comments

Comments
 (0)