fix: knip, test

ubiquity-os · Jul 24, 2024 · 6018c59 · 6018c59
1 parent 34adce1
commit 6018c59
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 38 deletions.
diff --git a/.github/knip.ts b/.github/knip.ts
@@ -3,10 +3,10 @@ import type { KnipConfig } from "knip";
 const config: KnipConfig = {
   entry: ["src/worker.ts", "deploy/setup-kv-namespace.ts"],
   project: ["src/**/*.ts"],
-  ignore: ["jest.config.js"],
+  ignore: ["jest.config.ts"],
   ignoreBinaries: ["i"],
   ignoreExportsUsedInFile: true,
-  ignoreDependencies: ["@mswjs/data", "esbuild", "eslint-config-prettier", "eslint-plugin-prettier", "msw"],
+  ignoreDependencies: ["@mswjs/data", "esbuild", "eslint-config-prettier", "eslint-plugin-prettier", "msw", "ts-node"],
 };
 
 export default config;
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -80,14 +80,12 @@
     "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-sonarjs": "1.0.3",
     "husky": "9.0.11",
-    "jest-md-dashboard": "0.8.0",
     "knip": "5.26.0",
     "lint-staged": "15.2.7",
     "npm-run-all": "4.1.5",
     "prettier": "3.3.3",
     "toml": "3.0.0",
     "tomlify-j0.4": "3.0.0",
-    "ts-jest": "29.2.2",
     "tsx": "4.16.2",
     "typescript": "5.5.3",
     "typescript-eslint": "7.16.0",

diff --git a/src/github/handlers/index.ts b/src/github/handlers/index.ts
@@ -34,6 +34,7 @@ async function shouldSkipPlugin(event: EmitterWebhookEvent, context: GitHubConte
   if (
     context.key === "issue_comment.created" &&
     manifest &&
+    manifest.commands &&
     !Object.keys(manifest.commands).some(
       (command) => "comment" in context.payload && typeof context.payload.comment !== "string" && context.payload.comment?.body.startsWith(`/${command}`)
     )

diff --git a/src/github/utils/plugins.ts b/src/github/utils/plugins.ts
@@ -23,7 +23,7 @@ async function fetchActionManifest(context: GitHubContext<"issue_comment.created
     return _manifestCache[manifestKey];
   }
   try {
-    const { data } = await context.octokit.repos.getContent({
+    const { data } = await context.octokit.rest.repos.getContent({
       owner,
       repo,
       path: "manifest.json",

diff --git a/tests/events.test.ts b/tests/events.test.ts
@@ -60,42 +60,43 @@ describe("Event related tests", () => {
         rest: {
           issues,
           repos: {
-            getContent() {
-              return {
-                data: `
-                  plugins:
-                    - name: "Run on comment created"
-                      uses:
-                        - id: plugin-A
-                          plugin: https://plugin-a.internal
-                    - name: "Some Action plugin"
-                      uses:
-                        - id: plugin-B
-                          plugin: ubiquibot/plugin-b
-                  `,
-              };
+            getContent(params?: RestEndpointMethodTypes["repos"]["getContent"]["parameters"]) {
+              if (params?.path === ".github/.ubiquibot-config.yml") {
+                return {
+                  data: `
+                    plugins:
+                      - name: "Run on comment created"
+                        uses:
+                          - id: plugin-A
+                            plugin: https://plugin-a.internal
+                      - name: "Some Action plugin"
+                        uses:
+                          - id: plugin-B
+                            plugin: ubiquibot/plugin-b
+                    `,
+                };
+              } else if (params?.path === "manifest.json") {
+                return {
+                  data: {
+                    content: btoa(
+                      JSON.stringify({
+                        name: "plugin",
+                        commands: {
+                          action: {
+                            description: "action",
+                            "ubiquity:example": "/action",
+                          },
+                        },
+                      })
+                    ),
+                  },
+                };
+              } else {
+                throw new Error("Not found");
+              }
             },
           },
         },
-        repos: {
-          getContent() {
-            return {
-              data: {
-                content: btoa(
-                  JSON.stringify({
-                    name: "plugin",
-                    commands: {
-                      action: {
-                        description: "action",
-                        "ubiquity:example": "/action",
-                      },
-                    },
-                  })
-                ),
-              },
-            };
-          },
-        },
       },
       eventHandler: {} as GitHubEventHandler,
       payload: {