diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-09-04 13:33:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 13:33:38 +0900 |
| commit | 1f7a81aae71f85a47393491a7795b953e2427041 (patch) | |
| tree | 5da5ed9d86ca7e536b789da26a350796e9a7a3dd /packages/backend/test/unit/FetchInstanceMetadataService.ts | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-1f7a81aae71f85a47393491a7795b953e2427041.tar.gz sharkey-1f7a81aae71f85a47393491a7795b953e2427041.tar.bz2 sharkey-1f7a81aae71f85a47393491a7795b953e2427041.zip | |
update deps (#11764)
* update deps
* node16
* wip
* wip
* wip
* Update test-utils.ts
* wip
* Update tsconfig.json
* wip
* Update package.json
* wip
* Update following.vue
* Update followers.vue
* Update index.vue
* Update share.vue
* Update MkUserPopup.vue
* Update MkPostForm.vue
* wip
* Update MkTokenGenerateWindow.vue
* Update MkPagination.vue
* refactor
* update deps
* update deps
* Update sw.ts
* wip
* wip
* wip
* Update FetchInstanceMetadataService.ts
* Update FetchInstanceMetadataService.ts
* update node
* update deps
* :art:
Diffstat (limited to 'packages/backend/test/unit/FetchInstanceMetadataService.ts')
| -rw-r--r-- | packages/backend/test/unit/FetchInstanceMetadataService.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts index 22ce023216..34200899d4 100644 --- a/packages/backend/test/unit/FetchInstanceMetadataService.ts +++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts @@ -6,7 +6,6 @@ process.env.NODE_ENV = 'test'; import { jest } from '@jest/globals'; -import { ModuleMocker } from 'jest-mock'; import { Test } from '@nestjs/testing'; import { Redis } from 'ioredis'; import { GlobalModule } from '@/GlobalModule.js'; @@ -18,7 +17,6 @@ import { UtilityService } from '@/core/UtilityService.js'; import { IdService } from '@/core/IdService.js'; import { DI } from '@/di-symbols.js'; import type { TestingModule } from '@nestjs/testing'; -import type { MockFunctionMetadata } from 'jest-mock'; function mockRedis() { const hash = {}; @@ -35,9 +33,9 @@ describe('FetchInstanceMetadataService', () => { let fetchInstanceMetadataService: jest.Mocked<FetchInstanceMetadataService>; let federatedInstanceService: jest.Mocked<FederatedInstanceService>; let httpRequestService: jest.Mocked<HttpRequestService>; - let redisClient: jest.Mocked<Redis.Redis>; + let redisClient: jest.Mocked<Redis>; - beforeAll(async () => { + beforeEach(async () => { app = await Test .createTestingModule({ imports: [ @@ -64,11 +62,11 @@ describe('FetchInstanceMetadataService', () => { fetchInstanceMetadataService = app.get<FetchInstanceMetadataService>(FetchInstanceMetadataService); federatedInstanceService = app.get<FederatedInstanceService>(FederatedInstanceService) as jest.Mocked<FederatedInstanceService>; - redisClient = app.get<Redis.Redis>(DI.redis) as jest.Mocked<Redis.Redis>; + redisClient = app.get<Redis>(DI.redis) as jest.Mocked<Redis>; httpRequestService = app.get<HttpRequestService>(HttpRequestService) as jest.Mocked<HttpRequestService>; }); - afterAll(async () => { + afterEach(async () => { await app.close(); }); @@ -85,6 +83,7 @@ describe('FetchInstanceMetadataService', () => { expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1); expect(httpRequestService.getJson).toHaveBeenCalled(); }); + test('Lock and don\'t update', async () => { redisClient.set = mockRedis(); const now = Date.now(); @@ -98,6 +97,7 @@ describe('FetchInstanceMetadataService', () => { expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1); expect(httpRequestService.getJson).toHaveBeenCalledTimes(0); }); + test('Do nothing when lock not acquired', async () => { redisClient.set = mockRedis(); federatedInstanceService.fetch.mockReturnValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } }); |