Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dima Krasner
Sharkey
Commits
2aa73fdf
Unverified
Commit
2aa73fdf
authored
2 years ago
by
Kagami Sascha Rosylight
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
test(backend): restore AP unit tests (#9987)
parent
cd5615d3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/backend/test/misc/mock-resolver.ts
+32
-2
32 additions, 2 deletions
packages/backend/test/misc/mock-resolver.ts
packages/backend/test/unit/activitypub.ts
+34
-15
34 additions, 15 deletions
packages/backend/test/unit/activitypub.ts
with
66 additions
and
17 deletions
packages/backend/test/misc/mock-resolver.ts
+
32
−
2
View file @
2aa73fdf
import
Resolver
from
'
../../src/activitypub/resolver.js
'
;
import
{
IObject
}
from
'
../../src/activitypub/type.js
'
;
import
type
{
Config
}
from
'
@/config.js
'
;
import
type
{
ApDbResolverService
}
from
'
@/core/activitypub/ApDbResolverService.js
'
;
import
type
{
ApRendererService
}
from
'
@/core/activitypub/ApRendererService.js
'
;
import
type
{
ApRequestService
}
from
'
@/core/activitypub/ApRequestService.js
'
;
import
{
Resolver
}
from
'
@/core/activitypub/ApResolverService.js
'
;
import
type
{
IObject
}
from
'
@/core/activitypub/type.js
'
;
import
type
{
HttpRequestService
}
from
'
@/core/HttpRequestService.js
'
;
import
type
{
InstanceActorService
}
from
'
@/core/InstanceActorService.js
'
;
import
type
{
LoggerService
}
from
'
@/core/LoggerService.js
'
;
import
type
{
MetaService
}
from
'
@/core/MetaService.js
'
;
import
type
{
UtilityService
}
from
'
@/core/UtilityService.js
'
;
import
{
bindThis
}
from
'
@/decorators.js
'
;
import
type
{
NoteReactionsRepository
,
NotesRepository
,
PollsRepository
,
UsersRepository
}
from
'
@/models/index.js
'
;
type
MockResponse
=
{
type
:
string
;
...
...
@@ -8,6 +19,25 @@ type MockResponse = {
export
class
MockResolver
extends
Resolver
{
private
_rs
=
new
Map
<
string
,
MockResponse
>
();
constructor
(
loggerService
:
LoggerService
)
{
super
(
{}
as
Config
,
{}
as
UsersRepository
,
{}
as
NotesRepository
,
{}
as
PollsRepository
,
{}
as
NoteReactionsRepository
,
{}
as
UtilityService
,
{}
as
InstanceActorService
,
{}
as
MetaService
,
{}
as
ApRequestService
,
{}
as
HttpRequestService
,
{}
as
ApRendererService
,
{}
as
ApDbResolverService
,
loggerService
,
);
}
public
async
_register
(
uri
:
string
,
content
:
string
|
Record
<
string
,
any
>
,
type
=
'
application/activity+json
'
)
{
this
.
_rs
.
set
(
uri
,
{
type
,
...
...
This diff is collapsed.
Click to expand it.
packages/backend/test/
tests
/activitypub.ts
→
packages/backend/test/
unit
/activitypub.ts
+
34
−
15
View file @
2aa73fdf
...
...
@@ -2,8 +2,39 @@ process.env.NODE_ENV = 'test';
import
*
as
assert
from
'
assert
'
;
import
rndstr
from
'
rndstr
'
;
import
{
Test
}
from
'
@nestjs/testing
'
;
import
{
jest
}
from
'
@jest/globals
'
;
import
{
ApNoteService
}
from
'
@/core/activitypub/models/ApNoteService.js
'
;
import
{
ApPersonService
}
from
'
@/core/activitypub/models/ApPersonService.js
'
;
import
{
GlobalModule
}
from
'
@/GlobalModule.js
'
;
import
{
CoreModule
}
from
'
@/core/CoreModule.js
'
;
import
{
FederatedInstanceService
}
from
'
@/core/FederatedInstanceService.js
'
;
import
{
LoggerService
}
from
'
@/core/LoggerService.js
'
;
import
{
MockResolver
}
from
'
../misc/mock-resolver.js
'
;
describe
(
'
ActivityPub
'
,
()
=>
{
let
noteService
:
ApNoteService
;
let
personService
:
ApPersonService
;
let
resolver
:
MockResolver
;
beforeEach
(
async
()
=>
{
const
app
=
await
Test
.
createTestingModule
({
imports
:
[
GlobalModule
,
CoreModule
],
}).
compile
();
await
app
.
init
();
app
.
enableShutdownHooks
();
noteService
=
app
.
get
<
ApNoteService
>
(
ApNoteService
);
personService
=
app
.
get
<
ApPersonService
>
(
ApPersonService
);
resolver
=
new
MockResolver
(
await
app
.
resolve
<
LoggerService
>
(
LoggerService
));
// Prevent ApPersonService from fetching instance, as it causes Jest import-after-test error
const
federatedInstanceService
=
app
.
get
<
FederatedInstanceService
>
(
FederatedInstanceService
);
jest
.
spyOn
(
federatedInstanceService
,
'
fetch
'
).
mockImplementation
(()
=>
new
Promise
(()
=>
{}));
});
describe
(
'
Parse minimum object
'
,
()
=>
{
const
host
=
'
https://host1.test
'
;
const
preferredUsername
=
`
${
rndstr
(
'
A-Z
'
,
4
)}${
rndstr
(
'
a-z
'
,
4
)}
`
;
...
...
@@ -28,13 +59,9 @@ describe('ActivityPub', () => {
};
test
(
'
Minimum Actor
'
,
async
()
=>
{
const
{
MockResolver
}
=
await
import
(
'
../misc/mock-resolver.js
'
);
const
{
createPerson
}
=
await
import
(
'
../../src/activitypub/models/person.js
'
);
const
resolver
=
new
MockResolver
();
resolver
.
_register
(
actor
.
id
,
actor
);
const
user
=
await
createPerson
(
actor
.
id
,
resolver
);
const
user
=
await
personService
.
createPerson
(
actor
.
id
,
resolver
);
assert
.
deepStrictEqual
(
user
.
uri
,
actor
.
id
);
assert
.
deepStrictEqual
(
user
.
username
,
actor
.
preferredUsername
);
...
...
@@ -42,14 +69,10 @@ describe('ActivityPub', () => {
});
test
(
'
Minimum Note
'
,
async
()
=>
{
const
{
MockResolver
}
=
await
import
(
'
../misc/mock-resolver.js
'
);
const
{
createNote
}
=
await
import
(
'
../../src/activitypub/models/note.js
'
);
const
resolver
=
new
MockResolver
();
resolver
.
_register
(
actor
.
id
,
actor
);
resolver
.
_register
(
post
.
id
,
post
);
const
note
=
await
createNote
(
post
.
id
,
resolver
,
true
);
const
note
=
await
noteService
.
createNote
(
post
.
id
,
resolver
,
true
);
assert
.
deepStrictEqual
(
note
?.
uri
,
post
.
id
);
assert
.
deepStrictEqual
(
note
.
visibility
,
'
public
'
);
...
...
@@ -75,13 +98,9 @@ describe('ActivityPub', () => {
};
test
(
'
Actor
'
,
async
()
=>
{
const
{
MockResolver
}
=
await
import
(
'
../misc/mock-resolver.js
'
);
const
{
createPerson
}
=
await
import
(
'
../../src/activitypub/models/person.js
'
);
const
resolver
=
new
MockResolver
();
resolver
.
_register
(
actor
.
id
,
actor
);
const
user
=
await
createPerson
(
actor
.
id
,
resolver
);
const
user
=
await
personService
.
createPerson
(
actor
.
id
,
resolver
);
assert
.
deepStrictEqual
(
user
.
name
,
actor
.
name
.
substr
(
0
,
128
));
});
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment