diff options
| author | rinsuki <428rinsuki+git@gmail.com> | 2020-01-09 14:35:04 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2020-01-09 14:35:04 +0900 |
| commit | 3ecb0ab1612e0887193140b1a2f8a77872a6fac1 (patch) | |
| tree | d8592afad5c26ca26a6d9975a78478aee4db1c29 /test/user-notes.ts | |
| parent | 11.37.1 (diff) | |
| download | sharkey-3ecb0ab1612e0887193140b1a2f8a77872a6fac1.tar.gz sharkey-3ecb0ab1612e0887193140b1a2f8a77872a6fac1.tar.bz2 sharkey-3ecb0ab1612e0887193140b1a2f8a77872a6fac1.zip | |
Add GitHub Actions (#5522)
* add .github/workflows/nodejs.yml
* fix
* GitHub Actions: Node.js 8.xはサポートしない
* add .github/workflows/docker.yml
* Dockerビルドをキャッシュするように
* Run test in github actions
* 同リポジトリ内からのプルリクだと無駄に二回走るのを抑制
* 6925c00のdocker.ymlへの適応忘れ
* fix .circleci/misskey/test.yml
* test実行時にDBとかredisとか動かすように
* fix
* fix tests (#5544)
* fix test
* fix compile errors
* PATH引き継ぎでchild_process.spawn時のENOENTを修正
* サーバー起動処理を共通化
* fix coding style
* fd=4をipcに使うように
* fix port
* fix
* fix ws port
* #4033 にテストケースを追従
* fix?
* fix??
* fix
* fix
* fix
* maybe fix
* fix
* node 10.xサポートしてなかった
* 11.10じゃないとだめだった
* fix
* remove chart test
* fix
* chart test復活
* fix
* 一回一回コネクションを閉じる
* Revert "一回一回コネクションを閉じる"
This reverts commit 56e35cf4f83070744c8dd852f1a7075011d88828.
* 一回一回sync→dropしてるのをやめてみる
* fix
* fix
* …
* キャッシュを切ってみる
* add ts to require target
* omg fix
* Revert "キャッシュを切ってみる"
This reverts commit 88161c59d2ea769ddf87143ba4fd4660a06afdf2.
* done呼び忘れ
* 実際の文字数リミットと違ってたので対応
* テストケースがバグってたので修正
* Revert "一回一回sync→dropしてるのをやめてみる"
This reverts commit a9e543ba2eef790ac7a14ae8799b898765748e35.
* fix
* fix
* fix
* fix?
* fix
* chartのconnectionを分離する
* fix
* fix
* fix tsconfig?
* Revert "fix tsconfig?"
This reverts commit ba9269eaf65507ff97ec1dd2e27260fb2cf0510b.
* fix
* TS_NODE_FILES を scripts の方で指定
* Windowsェ
* Circle CIの実行条件をmasterへのpushのみに
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'test/user-notes.ts')
| -rw-r--r-- | test/user-notes.ts | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/test/user-notes.ts b/test/user-notes.ts index 63a97cd805..5094180202 100644 --- a/test/user-notes.ts +++ b/test/user-notes.ts @@ -16,7 +16,7 @@ process.env.NODE_ENV = 'test'; import * as assert from 'assert'; import * as childProcess from 'child_process'; -import { async, signup, request, post, uploadFile } from './utils'; +import { async, signup, request, post, uploadFile, launchServer } from './utils'; describe('users/notes', () => { let p: childProcess.ChildProcess; @@ -26,32 +26,20 @@ describe('users/notes', () => { let pngNote: any; let jpgPngNote: any; - before(done => { - p = childProcess.spawn('node', [__dirname + '/../index.js'], { - stdio: ['inherit', 'inherit', 'ipc'], - env: { NODE_ENV: 'test' } + before(launchServer(g => p = g, async () => { + alice = await signup({ username: 'alice' }); + const jpg = await uploadFile(alice, __dirname + '/resources/Lenna.jpg'); + const png = await uploadFile(alice, __dirname + '/resources/Lenna.png'); + jpgNote = await post(alice, { + fileIds: [jpg.id] }); - p.on('message', async message => { - if (message === 'ok') { - (p.channel as any).onread = () => {}; - - alice = await signup({ username: 'alice' }); - const jpg = await uploadFile(alice, __dirname + '/resources/Lenna.jpg'); - const png = await uploadFile(alice, __dirname + '/resources/Lenna.png'); - jpgNote = await post(alice, { - fileIds: [jpg.id] - }); - pngNote = await post(alice, { - fileIds: [png.id] - }); - jpgPngNote = await post(alice, { - fileIds: [jpg.id, png.id] - }); - - done(); - } + pngNote = await post(alice, { + fileIds: [png.id] }); - }); + jpgPngNote = await post(alice, { + fileIds: [jpg.id, png.id] + }); + })); after(() => { p.kill(); @@ -66,8 +54,8 @@ describe('users/notes', () => { assert.strictEqual(res.status, 200); assert.strictEqual(Array.isArray(res.body), true); assert.strictEqual(res.body.length, 2); - assert.strictEqual(res.body.some(note => note.id === jpgNote.id), true); - assert.strictEqual(res.body.some(note => note.id === jpgPngNote.id), true); + assert.strictEqual(res.body.some((note: any) => note.id === jpgNote.id), true); + assert.strictEqual(res.body.some((note: any) => note.id === jpgPngNote.id), true); })); it('ファイルタイプ指定 (jpg or png)', async(async () => { @@ -79,8 +67,8 @@ describe('users/notes', () => { assert.strictEqual(res.status, 200); assert.strictEqual(Array.isArray(res.body), true); assert.strictEqual(res.body.length, 3); - assert.strictEqual(res.body.some(note => note.id === jpgNote.id), true); - assert.strictEqual(res.body.some(note => note.id === pngNote.id), true); - assert.strictEqual(res.body.some(note => note.id === jpgPngNote.id), true); + assert.strictEqual(res.body.some((note: any) => note.id === jpgNote.id), true); + assert.strictEqual(res.body.some((note: any) => note.id === pngNote.id), true); + assert.strictEqual(res.body.some((note: any) => note.id === jpgPngNote.id), true); })); }); |