From 7d02b36092bbb4e1887abde57500e3aba13497f4 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 13 Mar 2021 23:22:54 +0900 Subject: [PATCH] Fix assets test and favicon type (#7344) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix * koa-faviconã¯image/x-iconãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚‰ã—ã„ * シンプル㫠* faviconãªã© --- assets/favicon.ico | Bin 0 -> 90022 bytes locales/ja-JP.yml | 2 +- src/server/web/index.ts | 2 +- test/fetch-resource.ts | 19 +++++++++++++------ test/utils.ts | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 assets/favicon.ico diff --git a/assets/favicon.ico b/assets/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..9be1ff62956cd5d1e21540bee043a3c6c144d453 GIT binary patch literal 90022 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 literal 0 HcmV?d00001 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index e5700fe059..5729da8da8 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -322,7 +322,7 @@ proxyRemoteFilesDescription: "ã“ã®è¨å®šã‚’有効ã«ã™ã‚‹ã¨ã€æœªä¿å˜ã¾ driveCapacityPerLocalAccount: "ãƒãƒ¼ã‚«ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã²ã¨ã‚Šã‚ãŸã‚Šã®ãƒ‰ãƒ©ã‚¤ãƒ–容é‡" driveCapacityPerRemoteAccount: "リモートユーザーã²ã¨ã‚Šã‚ãŸã‚Šã®ãƒ‰ãƒ©ã‚¤ãƒ–容é‡" inMb: "メガãƒã‚¤ãƒˆå˜ä½" -iconUrl: "アイコン画åƒã®URL" +iconUrl: "アイコン画åƒã®URL (faviconãªã©)" bannerUrl: "ãƒãƒŠãƒ¼ç”»åƒã®URL" basicInfo: "åŸºæœ¬æƒ…å ±" pinnedUsers: "ピン留ã‚ユーザー" diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 7b087bbf5b..ea356206ff 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -45,7 +45,7 @@ app.use(views(__dirname + '/views', { })); // Serve favicon -app.use(favicon(`${__dirname}/../../../assets/favicon.png`)); +app.use(favicon(`${__dirname}/../../../assets/favicon.ico`)); // Common request handler app.use(async (ctx, next) => { diff --git a/test/fetch-resource.ts b/test/fetch-resource.ts index bd3a325dc2..12a37b6cb0 100644 --- a/test/fetch-resource.ts +++ b/test/fetch-resource.ts @@ -22,6 +22,7 @@ const UNSPECIFIED = '*/*'; // Response Contet-Type const AP = 'application/activity+json; charset=utf-8'; +const JSON = 'application/json; charset=utf-8'; const HTML = 'text/html; charset=utf-8'; describe('Fetch resource', () => { @@ -50,33 +51,39 @@ describe('Fetch resource', () => { })); it('GET root', async(async () => { - const res = await simpleGet('/', 'text/html'); + const res = await simpleGet('/'); assert.strictEqual(res.status, 200); + assert.strictEqual(res.type, HTML); })); it('GET docs', async(async () => { - const res = await simpleGet('/docs/ja-JP/about', 'text/html'); + const res = await simpleGet('/docs/ja-JP/about'); assert.strictEqual(res.status, 200); + assert.strictEqual(res.type, HTML); })); it('GET api-doc', async(async () => { - const res = await simpleGet('/api-doc', 'text/html'); + const res = await simpleGet('/api-doc'); assert.strictEqual(res.status, 200); + assert.strictEqual(res.type, HTML); })); it('GET api.json', async(async () => { - const res = await simpleGet('/api.json', 'application/json'); + const res = await simpleGet('/api.json'); assert.strictEqual(res.status, 200); + assert.strictEqual(res.type, JSON); })); it('GET favicon.ico', async(async () => { - const res = await simpleGet('/favicon.ico', 'image/png'); + const res = await simpleGet('/favicon.ico'); assert.strictEqual(res.status, 200); + assert.strictEqual(res.type, 'image/x-icon'); })); it('GET apple-touch-icon.png', async(async () => { - const res = await simpleGet('/apple-touch-icon.png', 'image/png'); + const res = await simpleGet('/apple-touch-icon.png'); assert.strictEqual(res.status, 200); + assert.strictEqual(res.type, 'image/png'); })); }); diff --git a/test/utils.ts b/test/utils.ts index 55e877a8a2..b0393ee192 100644 --- a/test/utils.ts +++ b/test/utils.ts @@ -110,7 +110,7 @@ export function connectStream(user: any, channel: string, listener: (message: Re }); } -export const simpleGet = async (path: string, accept: string): Promise<{ status?: number, type?: string, location?: string }> => { +export const simpleGet = async (path: string, accept = '*/*'): Promise<{ status?: number, type?: string, location?: string }> => { // node-fetchã ã¨3xxã‚’å–ã‚Œãªã„ return await new Promise((resolve, reject) => { const req = http.request(`http://localhost:${port}${path}`, { -- GitLab