generated from nhcarrigan/template
feat: auto-merge non-breaking dependency updates (#5)
## Summary Minori now automatically merges dependency update PRs when they meet safety criteria, reducing manual work whilst maintaining safety for potentially breaking changes. ## Changes - ✨ Add version comparison utility to detect major version bumps - ✨ Add Gitea service methods for checking commit status and merging PRs - ✨ Add auto-merge logic that checks: - Is it a major version bump? (if yes, skip auto-merge) - Did CI checks pass? (if no, skip auto-merge) - If both conditions pass → auto-merge! 🎉 - ✅ Add comprehensive tests for all new functionality - 📊 Maintain ~94% test coverage ## How It Works When Minori processes a dependency update: 1. Check if a PR already exists for that dependency 2. If it exists, verify: - **Not a major version bump** (major bumps need manual review) - **CI status = "success"** (all checks must pass) 3. If both conditions are met → automatically merge the PR and delete the branch ## Test Plan - [x] All 114 tests passing - [x] New tests for version comparison utility - [x] New tests for Gitea service extensions - [x] Build successful - [x] Linting clean --- ✨ This PR was created with help from Hikari~ 🌸 Co-authored-by: Naomi Carrigan <commits@nhcarrigan.com> Reviewed-on: #5 Co-authored-by: Hikari <hikari@nhcarrigan.com> Co-committed-by: Hikari <hikari@nhcarrigan.com>
This commit was merged in pull request #5.
This commit is contained in:
@@ -6,11 +6,16 @@
|
||||
|
||||
/* eslint-disable vitest/valid-expect -- Test expectations don't need messages */
|
||||
/* eslint-disable max-lines-per-function -- Test suites require many test cases */
|
||||
/* eslint-disable max-lines -- Test suites naturally have many cases */
|
||||
/* eslint-disable max-statements -- Test suites naturally have many statements */
|
||||
/* eslint-disable @typescript-eslint/consistent-type-assertions -- Required for mocking */
|
||||
/* eslint-disable @typescript-eslint/consistent-type-imports -- Dynamic imports */
|
||||
/* eslint-disable @typescript-eslint/naming-convention -- Environment variables and Gitea API format */
|
||||
/* eslint-disable max-nested-callbacks -- Vitest structure requires nested callbacks */
|
||||
/* eslint-disable vitest/require-to-throw-message -- Generic throw assertion */
|
||||
/* eslint-disable vitest/prefer-to-be-truthy -- toBe(true) is clearer for boolean functions */
|
||||
/* eslint-disable vitest/prefer-to-be-falsy -- toBe(false) is clearer for boolean functions */
|
||||
/* eslint-disable stylistic/max-len -- Test files have long object literals */
|
||||
|
||||
import axios, { AxiosError, type AxiosResponse } from "axios";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
@@ -24,8 +29,9 @@ vi.mock("axios", async() => {
|
||||
default: {
|
||||
create: vi.fn(() => {
|
||||
return {
|
||||
get: vi.fn(),
|
||||
post: vi.fn(),
|
||||
delete: vi.fn(),
|
||||
get: vi.fn(),
|
||||
post: vi.fn(),
|
||||
};
|
||||
}),
|
||||
},
|
||||
@@ -69,6 +75,8 @@ describe("giteaService", () => {
|
||||
let mockGet: ReturnType<typeof vi.fn>;
|
||||
// eslint-disable-next-line @typescript-eslint/init-declarations -- Reassigned in beforeEach
|
||||
let mockPost: ReturnType<typeof vi.fn>;
|
||||
// eslint-disable-next-line @typescript-eslint/init-declarations -- Reassigned in beforeEach
|
||||
let mockDelete: ReturnType<typeof vi.fn>;
|
||||
const originalEnvironment = process.env;
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -77,9 +85,11 @@ describe("giteaService", () => {
|
||||
|
||||
mockGet = vi.fn();
|
||||
mockPost = vi.fn();
|
||||
mockDelete = vi.fn();
|
||||
vi.mocked(axios.create).mockReturnValue({
|
||||
get: mockGet,
|
||||
post: mockPost,
|
||||
delete: mockDelete,
|
||||
get: mockGet,
|
||||
post: mockPost,
|
||||
} as unknown as ReturnType<typeof axios.create>);
|
||||
|
||||
giteaService = new GiteaService();
|
||||
@@ -306,4 +316,69 @@ describe("giteaService", () => {
|
||||
{ params: { state: "closed" } },
|
||||
);
|
||||
});
|
||||
|
||||
it("should get commit status", async() => {
|
||||
expect.assertions(2);
|
||||
const mockStatus = {
|
||||
commit_url: "https://git.nhcarrigan.com/api/v1/repos/owner/repo/commits/abc123",
|
||||
repository: createMockRepository({ id: 1, name: "test-repo" }),
|
||||
sha: "abc123",
|
||||
state: "success",
|
||||
statuses: [],
|
||||
total_count: 0,
|
||||
url: "https://git.nhcarrigan.com/api/v1/repos/owner/repo/commits/abc123/status",
|
||||
};
|
||||
mockGet.mockResolvedValueOnce({ data: mockStatus });
|
||||
const result = await giteaService.getCommitStatus("owner", "repo", "abc123");
|
||||
expect(result).toStrictEqual(mockStatus);
|
||||
expect(mockGet).toHaveBeenCalledWith("/repos/owner/repo/commits/abc123/status");
|
||||
});
|
||||
|
||||
it("should merge a pull request successfully", async() => {
|
||||
expect.assertions(2);
|
||||
mockPost.mockResolvedValueOnce({ data: {} });
|
||||
const result = await giteaService.mergePullRequest("owner", "repo", 1);
|
||||
expect(result).toBe(true);
|
||||
expect(mockPost).toHaveBeenCalledWith("/repos/owner/repo/pulls/1/merge", {
|
||||
Do: "merge",
|
||||
MergeMessageField: "",
|
||||
MergeTitleField: "",
|
||||
delete_branch_after_merge: true,
|
||||
force_merge: false,
|
||||
head_commit_id: "",
|
||||
merge_when_checks_succeed: false,
|
||||
});
|
||||
});
|
||||
|
||||
it("should return false when merge fails", async() => {
|
||||
expect.assertions(1);
|
||||
const axiosError = new AxiosError("Merge conflict");
|
||||
mockPost.mockRejectedValueOnce(axiosError);
|
||||
const result = await giteaService.mergePullRequest("owner", "repo", 1);
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
|
||||
it("should delete a branch successfully", async() => {
|
||||
expect.assertions(2);
|
||||
mockDelete.mockResolvedValueOnce({ data: {} });
|
||||
const result = await giteaService.deleteBranch(
|
||||
"owner",
|
||||
"repo",
|
||||
"feature-branch",
|
||||
);
|
||||
expect(result).toBe(true);
|
||||
expect(mockDelete).toHaveBeenCalledWith("/repos/owner/repo/branches/feature-branch");
|
||||
});
|
||||
|
||||
it("should return false when branch deletion fails", async() => {
|
||||
expect.assertions(1);
|
||||
const axiosError = new AxiosError("Branch not found");
|
||||
mockDelete.mockRejectedValueOnce(axiosError);
|
||||
const result = await giteaService.deleteBranch(
|
||||
"owner",
|
||||
"repo",
|
||||
"nonexistent-branch",
|
||||
);
|
||||
expect(result).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -18,6 +18,8 @@ const mockGiteaGetFileContent = vi.fn();
|
||||
const mockGiteaListOrgRepositories = vi.fn();
|
||||
const mockGiteaCreatePullRequest = vi.fn();
|
||||
const mockGiteaListPullRequests = vi.fn();
|
||||
const mockGiteaGetCommitStatus = vi.fn();
|
||||
const mockGiteaMergePullRequest = vi.fn();
|
||||
const mockNpmGetPackageChangelog = vi.fn();
|
||||
const mockNpmGetPackageInfo = vi.fn();
|
||||
const mockAnalyzePackageJson = vi.fn();
|
||||
@@ -39,9 +41,11 @@ vi.mock("../../src/services/giteaService.js", () => {
|
||||
|
||||
GiteaService: class MockGiteaService {
|
||||
public createPullRequest = mockGiteaCreatePullRequest;
|
||||
public getCommitStatus = mockGiteaGetCommitStatus;
|
||||
public getFileContent = mockGiteaGetFileContent;
|
||||
public listOrgRepositories = mockGiteaListOrgRepositories;
|
||||
public listPullRequests = mockGiteaListPullRequests;
|
||||
public mergePullRequest = mockGiteaMergePullRequest;
|
||||
},
|
||||
};
|
||||
});
|
||||
@@ -221,6 +225,7 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
@@ -267,6 +272,7 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -289,6 +295,7 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -312,6 +319,7 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -354,6 +362,7 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
@@ -377,6 +386,7 @@ describe("updateOrchestratorService", () => {
|
||||
const mockUpdates = [ createMockUpdate() ];
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockNpmGetPackageChangelog.mockResolvedValue("## Changelog");
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo());
|
||||
@@ -426,6 +436,7 @@ describe("updateOrchestratorService", () => {
|
||||
const mockCleanup = vi.fn();
|
||||
mockGiteaListOrgRepositories.mockResolvedValue(mockRepos);
|
||||
mockGiteaGetFileContent.mockResolvedValue(mockFileContent);
|
||||
mockGiteaListPullRequests.mockResolvedValue([]);
|
||||
mockAnalyzePackageJson.mockResolvedValue(mockUpdates);
|
||||
mockCloneRepository.mockResolvedValue(createMockClonedRepo(mockCleanup));
|
||||
mockCreateOrUpdateBranch.mockResolvedValue({
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
/**
|
||||
* @copyright NHCarrigan
|
||||
* @license Naomi's Public License
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
/* eslint-disable vitest/valid-expect -- Test expectations don't need messages */
|
||||
/* eslint-disable max-lines-per-function -- Test suites naturally have many cases */
|
||||
/* eslint-disable max-nested-callbacks -- Vitest structure requires nesting */
|
||||
/* eslint-disable vitest/prefer-to-be-truthy -- toBe(true) is clearer for boolean functions */
|
||||
/* eslint-disable vitest/prefer-to-be-falsy -- toBe(false) is clearer for boolean functions */
|
||||
|
||||
import { describe, expect, it } from "vitest";
|
||||
import {
|
||||
isMajorVersionBump,
|
||||
stripVersionPrefix,
|
||||
} from "../../src/utils/versionComparison.js";
|
||||
|
||||
describe("versionComparison", () => {
|
||||
describe("stripVersionPrefix", () => {
|
||||
it("should strip caret prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("^1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip tilde prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("~1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip greater than prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix(">1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip less than prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("<1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip equals prefix", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("=1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should strip multiple prefix characters", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix(">=1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
|
||||
it("should return version without prefix unchanged", () => {
|
||||
expect.assertions(1);
|
||||
expect(stripVersionPrefix("1.2.3")).toBe("1.2.3");
|
||||
});
|
||||
});
|
||||
|
||||
describe("isMajorVersionBump", () => {
|
||||
it("should detect major version bump", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "2.0.0")).toBe(true);
|
||||
});
|
||||
|
||||
it("should detect major version bump with prefixes", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("^1.2.3", "^2.0.0")).toBe(true);
|
||||
});
|
||||
|
||||
it("should not detect minor version bump as major", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "1.3.0")).toBe(false);
|
||||
});
|
||||
|
||||
it("should not detect patch version bump as major", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "1.2.4")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle version with pre-release tags", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "2.0.0-beta.1")).toBe(true);
|
||||
});
|
||||
|
||||
it("should return false for invalid from version", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("invalid", "2.0.0")).toBe(false);
|
||||
});
|
||||
|
||||
it("should return false for invalid to version", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "invalid")).toBe(false);
|
||||
});
|
||||
|
||||
it("should return false for both invalid versions", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("invalid", "also-invalid")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle 0.x.x to 1.x.x as major bump", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("0.9.5", "1.0.0")).toBe(true);
|
||||
});
|
||||
|
||||
it("should not detect same version as major bump", () => {
|
||||
expect.assertions(1);
|
||||
expect(isMajorVersionBump("1.2.3", "1.2.3")).toBe(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user