Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/reactions/gitlab/merge-request-merged.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export class MergeRequestMerged extends Reaction<MergeRequestPayload> {
}

getTwitchChatMessage({ payload }: ReactionHandleOptions<MergeRequestPayload>): string {
return `The merge request from ${payload.user.username} has been merged into ${payload.repository.homepage}`;
return `The merge request from ${payload.user.username} has been merged into ${payload.object_attributes.url}`;
}

canHandle({ payload, event }: ReactionCanHandleOptions<MergeRequestPayload>): boolean {
Expand Down
2 changes: 1 addition & 1 deletion src/reactions/gitlab/merge-request-opened.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export class MergeRequestOpened extends Reaction<MergeRequestPayload> {
}

getTwitchChatMessage({ payload }: ReactionHandleOptions<MergeRequestPayload>): string {
return `${payload.user.username} just opened a merge request in ${payload.repository.homepage}`;
return `${payload.user.username} just opened a merge request in ${payload.object_attributes.url}`;
}

canHandle({ payload, event, config }: ReactionCanHandleOptions<MergeRequestPayload>): boolean {
Expand Down
1 change: 1 addition & 0 deletions src/schemas/gitlab/merge-request-payload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export interface MergeRequestPayload {
};
object_attributes: {
state: 'merged' | 'created' | 'updated' | 'closed' | 'opened';
url: url;
};
}
6 changes: 4 additions & 2 deletions test/builders/gitlab/merge-request-payload-builder.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { MergeRequestPayload } from '../../../src/schemas/gitlab/merge-request-payload';
import { merge } from 'lodash';
import { DeepPartial } from 'utility-types';
import { MergeRequestPayload } from '../../../src/schemas/gitlab/merge-request-payload';

export class MergeRequestPayloadBuilder {
private payload: MergeRequestPayload = {
Expand All @@ -17,10 +18,11 @@ export class MergeRequestPayloadBuilder {
},
object_attributes: {
state: 'merged',
url: 'http://example.com/diaspora/merge_requests/1',
},
};

public with(payload: Partial<MergeRequestPayload>): MergeRequestPayloadBuilder {
public with(payload: DeepPartial<MergeRequestPayload>): MergeRequestPayloadBuilder {
merge(this.payload, payload);

return this;
Expand Down
2 changes: 1 addition & 1 deletion test/reactions/gitlab/merge-request-merged.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('MergeRequestMerged', () => {
expect.objectContaining({
twitchChat: {
notified: true,
message: `The merge request from ${payload.user.username} has been merged into ${payload.repository.homepage}`,
message: `The merge request from ${payload.user.username} has been merged into ${payload.object_attributes.url}`,
},
}),
);
Expand Down
2 changes: 1 addition & 1 deletion test/reactions/gitlab/merge-request-opened.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ describe('MergeRequestOpened', () => {

expect(response).toEqual({
notified: true,
message: `${payload.user.username} just opened a merge request in ${payload.repository.homepage}`,
message: `${payload.user.username} just opened a merge request in ${payload.object_attributes.url}`,
});
});

Expand Down