From 92b45d1a9d4b121e2b975318b84ef466a25b7710 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 25 Jan 2019 15:56:49 +0900 Subject: [PATCH] Refactoring --- test/streaming.ts | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/test/streaming.ts b/test/streaming.ts index 1f4b593e2f..6186e348a7 100644 --- a/test/streaming.ts +++ b/test/streaming.ts @@ -45,37 +45,37 @@ describe('Streaming', () => { server.close(); }); - it('投稿がタイムラインに流れる', done => { + it('投稿がタイムラインに流れる', () => new Promise(async done => { const post = { text: 'foo' }; - signup().then(me => { - const ws = new WebSocket(`ws://localhost/streaming?i=${me.token}`); + const me = await signup(); - ws.on('open', () => { - ws.on('message', data => { - const msg = JSON.parse(data.toString()); - if (msg.type == 'channel' && msg.body.id == 'a') { - if (msg.body.type == 'note') { - expect(msg.body.body.text).eql(post.text); - ws.close(); - done(); - } - } else if (msg.type == 'connected' && msg.body.id == 'a') { - request('/notes/create', post, me); - } - }); + const ws = new WebSocket(`ws://localhost/streaming?i=${me.token}`); - ws.send(JSON.stringify({ - type: 'connect', - body: { - channel: 'homeTimeline', - id: 'a', - pong: true + ws.on('open', () => { + ws.on('message', data => { + const msg = JSON.parse(data.toString()); + if (msg.type == 'channel' && msg.body.id == 'a') { + if (msg.body.type == 'note') { + expect(msg.body.body.text).eql(post.text); + ws.close(); + done(); } - })); + } else if (msg.type == 'connected' && msg.body.id == 'a') { + request('/notes/create', post, me); + } }); + + ws.send(JSON.stringify({ + type: 'connect', + body: { + channel: 'homeTimeline', + id: 'a', + pong: true + } + })); }); - }); + })); });