Merge pull request #25 from nexoscreator/dev

fix

Author: nexoscreator

index.cjs

@@ -0,0 +1,2 @@
+// index.js
+require('./lib/index');

package.json

@@ -32,5 +32,7 @@
   "engines": {
     "node": ">= 18"
   },
+
   "type": "module"
-}
+}
+

src/Release/version.ts

@@ -5,23 +5,28 @@ import path from "path";
 
 const version = async (context: any) => {
     // Bump version in package.json
-
     if (context.payload.pull_request.merged) {
-        const packageJsonPath = path.join(__dirname, "package.json");
+        const packageJsonPath = path.resolve(process.cwd(), "package.json");
         const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
 
         const newVersion = semver.inc(packageJson.version, "patch");
 
         packageJson.version = newVersion;
         fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 
+        const { data: currentCommit } = await context.octokit.repos.getCommit({
+            owner: context.payload.repository.owner.login,
+            repo: context.payload.repository.name,
+            ref: context.payload.pull_request.head.sha,
+        });
+
         await context.octokit.repos.createOrUpdateFileContents({
             owner: context.payload.repository.owner.login,
             repo: context.payload.repository.name,
             path: "package.json",
             message: `chore: bump version to ${newVersion}`,
             content: Buffer.from(JSON.stringify(packageJson, null, 2)).toString("base64"),
-            sha: context.payload.pull_request.head.sha,
+            sha: currentCommit.sha,
         });
     }
 };

test/fixtures/issues.opened.json

@@ -1,18 +1,14 @@
 {
   "action": "opened",
   "issue": {
-    "number": 1,
-    "user": {
-      "login": "hiimbex"
-    }
+    "title": "Test issue",
+    "body": "This is a test issue",
+    "html_url": "https://github.com/test/repo/issues/1"
   },
   "repository": {
-    "name": "testing-things",
+    "name": "repo",
     "owner": {
-      "login": "hiimbex"
+      "login": "test"
     }
-  },
-  "installation": {
-    "id": 2
   }
 }

test/fixtures/pull_request.opened.json

@@ -0,0 +1,15 @@
+{
+    "action": "opened",
+    "pull_request": {
+      "title": "Test PR",
+      "body": "This is a test pull request",
+      "html_url": "https://github.com/test/repo/pull/1"
+    },
+    "repository": {
+      "name": "repo",
+      "owner": {
+        "login": "test"
+      }
+    }
+  }
+  

test/index.test.ts

@@ -1,83 +1,72 @@
-// You can import your modules
-// import index from '../src/index'
+// tests/handlers.test.ts
+import { test, expect, beforeEach, afterEach } from 'vitest';
+import nock from 'nock';
+import { Probot, ProbotOctokit } from 'probot';
+import myProbotApp from '../src';
 
-import nock from "nock";
-// Requiring our app implementation
-import myProbotApp from "../src/index.js";
-import { Probot, ProbotOctokit } from "probot";
-// Requiring our fixtures
-//import payload from "./fixtures/issues.opened.json" with { "type": "json"};
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-import { describe, beforeEach, afterEach, test, expect } from "vitest";
+const issuePayload = require('./fixtures/issues.opened.json');
+const pullRequestPayload = require('./fixtures/pull_request.opened.json');
 
-const issueCreatedBody = { body: "Thanks for opening this issue!" };
+let probot: Probot;
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
+beforeEach(() => {
+  probot = new Probot({
+    appId: 123,
+    privateKey: 'test',
+    octokit: ProbotOctokit.defaults({
+      throttle: { enabled: false },
+      retry: { enabled: false },
+    }),
+  });
+  probot.load(myProbotApp);
+});
 
-const privateKey = fs.readFileSync(
-  path.join(__dirname, "fixtures/mock-cert.pem"),
-  "utf-8",
-);
+afterEach(() => {
+  nock.cleanAll();
+});
 
-const payload = JSON.parse(
-  fs.readFileSync(path.join(__dirname, "fixtures/issues.opened.json"), "utf-8"),
-);
+test('sends a notification when an issue is opened', async () => {
+  nock('https://hooks.slack.com')
+    .post('/services/your/slack/webhook')
+    .reply(200);
 
-describe("My Probot app", () => {
-  let probot: any;
+  nock('https://discord.com')
+    .post('/api/webhooks/your/discord/webhook')
+    .reply(200);
 
-  beforeEach(() => {
-    nock.disableNetConnect();
-    probot = new Probot({
-      appId: 937788,
-      privateKey,
-      // disable request throttling and retries for testing
-      Octokit: ProbotOctokit.defaults({
-        retry: { enabled: false },
-        throttle: { enabled: false },
-      }),
-    });
-    // Load our app into probot
-    probot.load(myProbotApp);
+  const transporter = {
+    sendMail: vi.fn().mockResolvedValueOnce({}),
+  };
+  vi.mock('nodemailer', () => {
+    return {
+      createTransport: () => transporter,
+    };
   });
 
-  test("creates a comment when an issue is opened", async () => {
-    const mock = nock("https://api.github.com")
-      // Test that we correctly return a test token
-      .post("/app/installations/2/access_tokens")
-      .reply(200, {
-        token: "test",
-        permissions: {
-          issues: "write",
-        },
-      })
+  await probot.receive({ name: 'issues', payload: issuePayload });
 
-      // Test that a comment is posted
-      .post("/repos/hiimbex/testing-things/issues/1/comments", (body: any) => {
-        expect(body).toMatchObject(issueCreatedBody);
-        return true;
-      })
-      .reply(200);
+  expect(transporter.sendMail).toHaveBeenCalled();
+});
 
-    // Receive a webhook event
-    await probot.receive({ name: "issues", payload });
+test('sends a notification when a pull request is opened', async () => {
+  nock('https://hooks.slack.com')
+    .post('/services/your/slack/webhook')
+    .reply(200);
 
-    expect(mock.pendingMocks()).toStrictEqual([]);
-  });
+  nock('https://discord.com')
+    .post('/api/webhooks/your/discord/webhook')
+    .reply(200);
 
-  afterEach(() => {
-    nock.cleanAll();
-    nock.enableNetConnect();
+  const transporter = {
+    sendMail: vi.fn().mockResolvedValueOnce({}),
+  };
+  vi.mock('nodemailer', () => {
+    return {
+      createTransport: () => transporter,
+    };
   });
-});
 
-// For more information about testing with Jest see:
-// https://facebook.github.io/jest/
+  await probot.receive({ name: 'pull_request', payload: pullRequestPayload });
 
-// For more information about using TypeScript in your tests, Jest recommends:
-// https://github.com/kulshekhar/ts-jest
-
-// For more information about testing with Nock see:
-// https://github.com/nock/nock
+  expect(transporter.sendMail).toHaveBeenCalled();
+});

tsconfig.json

@@ -1,25 +1,14 @@
 {
   "compilerOptions": {
-    "incremental": true,
-    "target": "es2022",
-    "module": "Node16",
-    "declaration": true,
-    "sourceMap": true,
+    "module": "commonjs",
+    "target": "es2018",
     "outDir": "./lib",
-
-    /* Strict Type-Checking Options */
-    "strict": true,
-
-    /* Additional Checks */
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-
-    "moduleResolution": "Node16",
+    "rootDir": "src",
     "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true
   },
-  "include": ["src/"],
-  "compileOnSave": false
-}
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules"]
+}