Skip to content

Commit 53eed2e

Browse files
committed
fix socketspec
1 parent 6198bfd commit 53eed2e

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

packages/socket/lib/socket.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const fs = require('fs')
22
const server = require('socket.io')
3-
const path = require('path')
4-
const pkg = require('socket.io-client/package.json')
3+
const { version } = require('socket.io-client/package.json')
54
const { client, circularParser } = require('./browser')
6-
const resolvePkg = require('resolve-pkg')
5+
6+
const clientSource = require.resolve('socket.io-client/dist/socket.io.js')
77

88
module.exports = {
99
server,
@@ -13,17 +13,11 @@ module.exports = {
1313
circularParser,
1414

1515
getPathToClientSource () {
16-
const clientSource = resolvePkg('socket.io-client/dist/socket.io.js', { cwd: path.join(__dirname, '..', '..', '..') })
17-
18-
if (fs.existsSync(clientSource)) {
19-
return clientSource
20-
}
21-
22-
return require.resolve('socket.io-client/dist/socket.io.js')
16+
return clientSource
2317
},
2418

2519
getClientVersion () {
26-
return pkg.version
20+
return version
2721
},
2822

2923
getClientSource () {

packages/socket/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"test-watch": "cross-env NODE_ENV=test mocha --watch"
1313
},
1414
"dependencies": {
15-
"resolve-pkg": "2.0.0",
1615
"socket.io": "2.3.0",
1716
"socket.io-circular-parser": "cypress-io/socket.io-circular-parser#unpatched-has-binary-2",
1817
"socket.io-client": "2.3.0"
1918
},
2019
"devDependencies": {
2120
"chai": "3.5.0",
2221
"cross-env": "6.0.3",
23-
"mocha": "3.5.3"
22+
"mocha": "3.5.3",
23+
"resolve-pkg": "2.0.0"
2424
},
2525
"files": [
2626
"lib",

packages/socket/test/socket_spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('Socket', function () {
1818

1919
context('.getPathToClientSource', function () {
2020
it('returns path to socket.io.js', function () {
21-
const clientPath = path.join(resolvePkg('socket.io-client', { cwd: path.join(__dirname, '..', '..', '..') }), 'dist', 'socket.io.js')
21+
const clientPath = path.join(resolvePkg('socket.io-client'), 'dist', 'socket.io.js')
2222

2323
expect(lib.getPathToClientSource()).to.eq(clientPath)
2424
})
@@ -36,7 +36,7 @@ describe('Socket', function () {
3636

3737
context('.getClientSource', function () {
3838
it('returns client source as a string', function (done) {
39-
const clientPath = path.join(resolvePkg('socket.io-client', { cwd: path.join(__dirname, '..', '..', '..') }), 'dist', 'socket.io.js')
39+
const clientPath = path.join(resolvePkg('socket.io-client'), 'dist', 'socket.io.js')
4040

4141
fs.readFile(clientPath, 'utf8', function (err, str) {
4242
if (err) done(err)

0 commit comments

Comments
 (0)