Compare commits
3 Commits
ci/pnpm-ca
...
fix/base-i
| Author | SHA1 | Date | |
|---|---|---|---|
| d49b4cd6db | |||
| cd1c52c506 | |||
| a00f1e1fd7 |
27
.woodpecker/base-image.yml
Normal file
27
.woodpecker/base-image.yml
Normal file
@@ -0,0 +1,27 @@
|
||||
when:
|
||||
- event: manual
|
||||
- event: cron
|
||||
cron: weekly-base-image
|
||||
|
||||
variables:
|
||||
- &kaniko_setup |
|
||||
mkdir -p /kaniko/.docker
|
||||
echo "{\"auths\":{\"git.mosaicstack.dev\":{\"username\":\"$GITEA_USER\",\"password\":\"$GITEA_TOKEN\"}}}" > /kaniko/.docker/config.json
|
||||
|
||||
steps:
|
||||
build-base:
|
||||
image: gcr.io/kaniko-project/executor:debug
|
||||
environment:
|
||||
GITEA_USER:
|
||||
from_secret: gitea_username
|
||||
GITEA_TOKEN:
|
||||
from_secret: gitea_token
|
||||
commands:
|
||||
- *kaniko_setup
|
||||
- /kaniko/executor
|
||||
--context .
|
||||
--dockerfile docker/base.Dockerfile
|
||||
--destination git.mosaicstack.dev/mosaic/node-base:24-slim
|
||||
--destination git.mosaicstack.dev/mosaic/node-base:latest
|
||||
--cache=true
|
||||
--cache-repo git.mosaicstack.dev/mosaic/node-base/cache
|
||||
@@ -384,10 +384,18 @@ describe("ActivityLoggingInterceptor", () => {
|
||||
const context = createMockExecutionContext("POST", {}, body, user);
|
||||
const next = createMockCallHandler(result);
|
||||
|
||||
mockActivityService.logActivity.mockResolvedValue({
|
||||
id: "activity-123",
|
||||
});
|
||||
|
||||
await new Promise<void>((resolve) => {
|
||||
interceptor.intercept(context, next).subscribe(() => {
|
||||
// Should not call logActivity when workspaceId is missing
|
||||
expect(mockActivityService.logActivity).not.toHaveBeenCalled();
|
||||
// workspaceId is now optional, so logActivity should be called without it
|
||||
expect(mockActivityService.logActivity).toHaveBeenCalled();
|
||||
const callArgs = mockActivityService.logActivity.mock.calls[0][0];
|
||||
expect(callArgs.userId).toBe("user-123");
|
||||
expect(callArgs.entityId).toBe("task-123");
|
||||
expect(callArgs.workspaceId).toBeUndefined();
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
@@ -412,10 +420,18 @@ describe("ActivityLoggingInterceptor", () => {
|
||||
const context = createMockExecutionContext("POST", {}, body, user);
|
||||
const next = createMockCallHandler(result);
|
||||
|
||||
mockActivityService.logActivity.mockResolvedValue({
|
||||
id: "activity-123",
|
||||
});
|
||||
|
||||
await new Promise<void>((resolve) => {
|
||||
interceptor.intercept(context, next).subscribe(() => {
|
||||
// Should not call logActivity when workspaceId is missing
|
||||
expect(mockActivityService.logActivity).not.toHaveBeenCalled();
|
||||
// workspaceId is now optional, so logActivity should be called without it
|
||||
expect(mockActivityService.logActivity).toHaveBeenCalled();
|
||||
const callArgs = mockActivityService.logActivity.mock.calls[0][0];
|
||||
expect(callArgs.userId).toBe("user-123");
|
||||
expect(callArgs.entityId).toBe("task-123");
|
||||
expect(callArgs.workspaceId).toBeUndefined();
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user