Skip to content

Node.js based forum software built for the modern web

test: fix helpers.mocks.create to accept custom actor

Julian Lam681b5f94c694
diff --git a/test/activitypub/helpers.js b/test/activitypub/helpers.js
index eb3056d2af..bae6e1aac0 100644
--- a/test/activitypub/helpers.js
+++ b/test/activitypub/helpers.js
@@ -96,20 +96,40 @@ Helpers.mocks.note = (override = {}) => {
return { id, note };
};
-Helpers.mocks.create = (object) => {
- // object is optional, will generate a public note if undefined
+Helpers.mocks.create = (input = {}) => {
+ let object;
+ let actor = 'https://example.org/user/foobar';
+ let override = {};
+
+ // Support both old API (positional note object) and new API (override object with actor/object keys)
+ if (input && typeof input === 'object' && input.type === 'Note') {
+ // Old API: first argument is the note object
+ object = input;
+ } else {
+ // New API: override object
+ override = input;
+ object = override.object;
+ actor = override.actor || actor;
+ delete override.actor;
+ delete override.object;
+ }
+
+ if (!object) {
+ object = Helpers.mocks.note().note;
+ }
+
const uuid = utils.generateUUID();
const id = `${Helpers.mocks._baseUrl}/activity/${uuid}`;
- object = object || Helpers.mocks.note().note;
const activity = {
'@context': 'https://www.w3.org/ns/activitystreams',
id,
type: 'Create',
to: ['https://www.w3.org/ns/activitystreams#Public'],
- cc: ['https://example.org/user/foobar/followers'],
- actor: 'https://example.org/user/foobar',
+ cc: [`${actor}/followers`],
+ actor,
object,
+ ...override,
};
activitypub._cache.set(`0;${id}`, activity);
diff --git a/test/activitypub/inbox-cids.js b/test/activitypub/inbox-cids.js
index 58f3cfab28..f3f2df59dc 100644
--- a/test/activitypub/inbox-cids.js
+++ b/test/activitypub/inbox-cids.js
@@ -28,24 +28,6 @@ describe('Inbox – uid:<uid>:cids sorted set', () => {
await install.giveWorldPrivileges();
});
- /**
- * Helper: manually construct a Create activity.
- * helpers.mocks.create() hardcodes actor to 'https://example.org/user/foobar',
- * so we can't use it when we need a custom actor.
- */
- function makeCreateActivity(note) {
- const uuid = utils.generateUUID();
- const id = `${helpers.mocks._baseUrl}/activity/${uuid}`;
- return {
- '@context': 'https://www.w3.org/ns/activitystreams',
- id,
- type: 'Create',
- to: ['https://www.w3.org/ns/activitystreams#Public'],
- cc: [`${note.attributedTo}/followers`],
- actor: note.attributedTo,
- object: note,
- };
- }
describe('Create (Note) – remote user posting to local cid -1', () => {
let remoteActor;
@@ -61,7 +43,7 @@ describe('Inbox – uid:<uid>:cids sorted set', () => {
const { note, id } = helpers.mocks.note({
attributedTo: remoteActor,
});
- const activity = makeCreateActivity(note);
+ const { activity } = helpers.mocks.create({ actor: remoteActor, object: note });
await activitypub.inbox.create({ body: activity });
@@ -104,7 +86,7 @@ describe('Inbox – uid:<uid>:cids sorted set', () => {
attributedTo: remoteActor,
cc: [`${nconf.get('url')}/category/${cid}`],
});
- const activity = makeCreateActivity(note);
+ const { activity } = helpers.mocks.create({ actor: remoteActor, object: note });
await activitypub.inbox.create({ body: activity });
@@ -149,7 +131,7 @@ describe('Inbox – uid:<uid>:cids sorted set', () => {
attributedTo: remoteActor,
audience: [remoteCid],
});
- const activity = makeCreateActivity(note);
+ const { activity } = helpers.mocks.create({ actor: remoteActor, object: note });
await activitypub.inbox.create({ body: activity });
@@ -194,7 +176,7 @@ describe('Inbox – uid:<uid>:cids sorted set', () => {
attributedTo: remoteActor,
cc: [`${nconf.get('url')}/category/${cid1}`],
});
- const activity1 = makeCreateActivity(note1);
+ const { activity: activity1 } = helpers.mocks.create({ actor: remoteActor, object: note1 });
await activitypub.inbox.create({ body: activity1 });
// Then post to cid2
@@ -202,7 +184,7 @@ describe('Inbox – uid:<uid>:cids sorted set', () => {
attributedTo: remoteActor,
cc: [`${nconf.get('url')}/category/${cid2}`],
});
- const activity2 = makeCreateActivity(note2);
+ const { activity: activity2 } = helpers.mocks.create({ actor: remoteActor, object: note2 });
await activitypub.inbox.create({ body: activity2 });
});
@@ -243,7 +225,7 @@ describe('Inbox – uid:<uid>:cids sorted set', () => {
attributedTo: remoteActor,
cc: [`${nconf.get('url')}/category/${cid}`],
});
- const createActivity = makeCreateActivity(note);
+ const { activity: createActivity } = helpers.mocks.create({ actor: remoteActor, object: note });
await activitypub.inbox.create({ body: createActivity });
remoteTid = id;