Skip to content

Commit c76cea4

Browse files
committed
Giving up on typescript...
1 parent 8cf3002 commit c76cea4

File tree

6 files changed

+58
-9
lines changed

6 files changed

+58
-9
lines changed

jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ module.exports = {
22
transform: {
33
'^.+\\.tsx?$': 'ts-jest',
44
},
5-
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
5+
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node', 'd.ts'],
66
};

js-src/Channel.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ export class Channel extends BaseChannel implements PresenceChannel {
2727
*/
2828
eventFormatter: EventFormatter;
2929

30-
private listeners: { [index: string]: Function } = {};
31-
3230
/**
3331
* Create a new class instance.
3432
*/

js-tests/Connector.test.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import WS from "jest-websocket-mock";
2+
import {Connector} from "../dist/Connector";
3+
4+
describe('Connector', () => {
5+
let server;
6+
7+
beforeEach(() => {
8+
server = new WS("ws://localhost:1234");
9+
});
10+
11+
test('socket id is correctly set', async () => {
12+
const connector = new Connector({
13+
host: "ws://localhost:1234",
14+
})
15+
16+
await server.connected;
17+
18+
await expect(server).toReceiveMessage('{"event":"whoami"}');
19+
20+
server.send('{"event":"whoami","data":{"socket_id":"test-socket-id"}}')
21+
22+
expect(connector.socketId()).toBe('test-socket-id')
23+
})
24+
});

js-tests/example.test.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"build": "npm run compile && npm run declarations",
2727
"compile": "./node_modules/.bin/rollup -c",
2828
"declarations": "./node_modules/.bin/tsc --emitDeclarationOnly",
29-
"lint": "eslint --ext .js,.ts js-src",
29+
"lint": "eslint --ext .js,.ts ./js-src ./js-tests",
3030
"prepublish": "npm run build",
3131
"release": "npm run test && standard-version && git push --follow-tags && npm publish",
3232
"test": "jest"
@@ -47,7 +47,9 @@
4747
"axios": "^0.21.1",
4848
"eslint": "^7.5.0",
4949
"jest": "^24.9.0",
50+
"jest-websocket-mock": "^2.2.0",
5051
"laravel-echo": "^1.10.0",
52+
"mock-socket": "^9.0.3",
5153
"rollup": "^2.10.2",
5254
"rollup-plugin-typescript2": "^0.27.1",
5355
"standard-version": "^8.0.1",

yarn.lock

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3659,6 +3659,11 @@ jest-watcher@^24.9.0:
36593659
jest-util "^24.9.0"
36603660
string-length "^2.0.0"
36613661

3662+
jest-websocket-mock@^2.2.0:
3663+
version "2.2.0"
3664+
resolved "https://registry.yarnpkg.com/jest-websocket-mock/-/jest-websocket-mock-2.2.0.tgz#0eed73eb3c14d48b15dd046c9e40e9571377d06e"
3665+
integrity sha512-lc3wwXOEyNa4ZpcgJtUG3mmKMAq5FAsKYiZph0p/+PAJrAPuX4JCIfJMdJ/urRsLBG51fwm/wlVPNbR6s2nzNw==
3666+
36623667
jest-worker@^24.6.0, jest-worker@^24.9.0:
36633668
version "24.9.0"
36643669
resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
@@ -4174,6 +4179,13 @@ mkdirp@0.x, mkdirp@^0.5.1:
41744179
dependencies:
41754180
minimist "^1.2.5"
41764181

4182+
mock-socket@^9.0.3:
4183+
version "9.0.3"
4184+
resolved "https://registry.yarnpkg.com/mock-socket/-/mock-socket-9.0.3.tgz#4bc6d2aea33191e4fed5ec71f039e2bbeb95e414"
4185+
integrity sha512-SxIiD2yE/By79p3cNAAXyLQWTvEFNEzcAO7PH+DzRqKSFaplAPFjiQLmw8ofmpCsZf+Rhfn2/xCJagpdGmYdTw==
4186+
dependencies:
4187+
url-parse "^1.4.4"
4188+
41774189
modify-values@^1.0.0:
41784190
version "1.0.1"
41794191
resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
@@ -4690,6 +4702,11 @@ qs@~6.5.2:
46904702
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
46914703
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
46924704

4705+
querystringify@^2.1.1:
4706+
version "2.2.0"
4707+
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
4708+
integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
4709+
46934710
quick-lru@^1.0.0:
46944711
version "1.1.0"
46954712
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
@@ -4966,6 +4983,11 @@ require-main-filename@^2.0.0:
49664983
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
49674984
integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
49684985

4986+
requires-port@^1.0.0:
4987+
version "1.0.0"
4988+
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
4989+
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
4990+
49694991
resolve-cwd@^2.0.0:
49704992
version "2.0.0"
49714993
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -5796,6 +5818,14 @@ urix@^0.1.0:
57965818
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
57975819
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
57985820

5821+
url-parse@^1.4.4:
5822+
version "1.4.7"
5823+
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
5824+
integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
5825+
dependencies:
5826+
querystringify "^2.1.1"
5827+
requires-port "^1.0.0"
5828+
57995829
use@^3.1.0:
58005830
version "3.1.1"
58015831
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"

0 commit comments

Comments
 (0)