エラー修正
This commit is contained in:
parent
f826b61723
commit
6ef8116494
|
@ -7,6 +7,7 @@ import { Test } from '@nestjs/testing';
|
||||||
|
|
||||||
import { CoreModule } from '@/core/CoreModule.js';
|
import { CoreModule } from '@/core/CoreModule.js';
|
||||||
import { NoteCreateService } from '@/core/NoteCreateService.js';
|
import { NoteCreateService } from '@/core/NoteCreateService.js';
|
||||||
|
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
|
||||||
import { GlobalModule } from '@/GlobalModule.js';
|
import { GlobalModule } from '@/GlobalModule.js';
|
||||||
import { MiNote } from '@/models/Note.js';
|
import { MiNote } from '@/models/Note.js';
|
||||||
import { IPoll } from '@/models/Poll.js';
|
import { IPoll } from '@/models/Poll.js';
|
||||||
|
@ -14,12 +15,13 @@ import { MiDriveFile } from '@/models/DriveFile.js';
|
||||||
|
|
||||||
describe('NoteCreateService', () => {
|
describe('NoteCreateService', () => {
|
||||||
let noteCreateService: NoteCreateService;
|
let noteCreateService: NoteCreateService;
|
||||||
|
let noteEntityService: NoteEntityService;
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
const app = await Test.createTestingModule({
|
const app = await Test.createTestingModule({
|
||||||
imports: [GlobalModule, CoreModule],
|
imports: [GlobalModule, CoreModule],
|
||||||
}).compile();
|
}).compile();
|
||||||
noteCreateService = app.get<NoteCreateService>(NoteCreateService);
|
noteCreateService = app.get<NoteCreateService>(NoteCreateService);
|
||||||
|
noteEntityService = app.get<NoteEntityService>(NoteEntityService);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('is-renote', () => {
|
describe('is-renote', () => {
|
||||||
|
@ -109,37 +111,37 @@ describe('NoteCreateService', () => {
|
||||||
test('note with renote should be Renote and not be Quote', () => {
|
test('note with renote should be Renote and not be Quote', () => {
|
||||||
const note = { renote: base };
|
const note = { renote: base };
|
||||||
expect(noteCreateService['isRenote'](note)).toBe(true);
|
expect(noteCreateService['isRenote'](note)).toBe(true);
|
||||||
expect(noteCreateService['isQuote'](note)).toBe(false);
|
expect(noteEntityService['isQuote'](note)).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('note with renote and text should be Quote', () => {
|
test('note with renote and text should be Quote', () => {
|
||||||
const note = { renote: base, text: 'some-text' };
|
const note = { renote: base, text: 'some-text' };
|
||||||
expect(noteCreateService['isRenote'](note)).toBe(true);
|
expect(noteCreateService['isRenote'](note)).toBe(true);
|
||||||
expect(noteCreateService['isQuote'](note)).toBe(true);
|
expect(noteEntityService['isQuote'](note)).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('note with renote and cw should be Quote', () => {
|
test('note with renote and cw should be Quote', () => {
|
||||||
const note = { renote: base, cw: 'some-cw' };
|
const note = { renote: base, cw: 'some-cw' };
|
||||||
expect(noteCreateService['isRenote'](note)).toBe(true);
|
expect(noteCreateService['isRenote'](note)).toBe(true);
|
||||||
expect(noteCreateService['isQuote'](note)).toBe(true);
|
expect(noteEntityService['isQuote'](note)).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('note with renote and reply should be Quote', () => {
|
test('note with renote and reply should be Quote', () => {
|
||||||
const note = { renote: base, reply: { ...base, id: 'another-note-id' } };
|
const note = { renote: base, reply: { ...base, id: 'another-note-id' } };
|
||||||
expect(noteCreateService['isRenote'](note)).toBe(true);
|
expect(noteCreateService['isRenote'](note)).toBe(true);
|
||||||
expect(noteCreateService['isQuote'](note)).toBe(true);
|
expect(noteEntityService['isQuote'](note)).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('note with renote and poll should be Quote', () => {
|
test('note with renote and poll should be Quote', () => {
|
||||||
const note = { renote: base, poll };
|
const note = { renote: base, poll };
|
||||||
expect(noteCreateService['isRenote'](note)).toBe(true);
|
expect(noteCreateService['isRenote'](note)).toBe(true);
|
||||||
expect(noteCreateService['isQuote'](note)).toBe(true);
|
expect(noteEntityService['isQuote'](note)).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('note with renote and non-empty files should be Quote', () => {
|
test('note with renote and non-empty files should be Quote', () => {
|
||||||
const note = { renote: base, files: [file] };
|
const note = { renote: base, files: [file] };
|
||||||
expect(noteCreateService['isRenote'](note)).toBe(true);
|
expect(noteCreateService['isRenote'](note)).toBe(true);
|
||||||
expect(noteCreateService['isQuote'](note)).toBe(true);
|
expect(noteEntityService['isQuote'](note)).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -10,8 +10,8 @@ import { Test } from '@nestjs/testing';
|
||||||
import { jest } from '@jest/globals';
|
import { jest } from '@jest/globals';
|
||||||
|
|
||||||
import { MockResolver } from '../misc/mock-resolver.js';
|
import { MockResolver } from '../misc/mock-resolver.js';
|
||||||
import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
|
|
||||||
import type { MiRemoteUser } from '@/models/User.js';
|
import type { MiRemoteUser } from '@/models/User.js';
|
||||||
|
import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
|
||||||
import { ApImageService } from '@/core/activitypub/models/ApImageService.js';
|
import { ApImageService } from '@/core/activitypub/models/ApImageService.js';
|
||||||
import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js';
|
import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js';
|
||||||
import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
|
import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
|
||||||
|
@ -22,7 +22,6 @@ import { GlobalModule } from '@/GlobalModule.js';
|
||||||
import { CoreModule } from '@/core/CoreModule.js';
|
import { CoreModule } from '@/core/CoreModule.js';
|
||||||
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
|
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
|
||||||
import { LoggerService } from '@/core/LoggerService.js';
|
import { LoggerService } from '@/core/LoggerService.js';
|
||||||
import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
|
|
||||||
import { MiMeta, MiNote, UserProfilesRepository } from '@/models/_.js';
|
import { MiMeta, MiNote, UserProfilesRepository } from '@/models/_.js';
|
||||||
import { DI } from '@/di-symbols.js';
|
import { DI } from '@/di-symbols.js';
|
||||||
import { secureRndstr } from '@/misc/secure-rndstr.js';
|
import { secureRndstr } from '@/misc/secure-rndstr.js';
|
||||||
|
|
Loading…
Reference in New Issue