From 37aa1928255e711555bd01e7d0025485e0251014 Mon Sep 17 00:00:00 2001
From: Emil Kantis <emil@codeboss.se>
Date: Mon, 13 Mar 2023 19:29:32 +0100
Subject: [PATCH] Fixing tests in an environment where GPG signatures are
 globally enabled

---
 src/main.test.ts | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main.test.ts b/src/main.test.ts
index 1b895f1..e87d3ae 100644
--- a/src/main.test.ts
+++ b/src/main.test.ts
@@ -33,7 +33,10 @@ const createTestRepo = (repoDefaultConfig?: Partial<ActionConfig>) => {
                 run(`touch ${path !== '' ? path.trim() + '/' : ''}test${i++}`);
             }
             run(`git add --all`);
-            run(`git commit -m "${msg}"`);
+            run(`git -c commit.gpgsign=false commit -m "${msg}"`);
+        },
+        merge: (branch: string) => {
+            run(`git -c commit.gpgsign=false merge ${branch}`);
         },
         runAction: async (inputs?: Partial<ActionConfig>) => {
             let config = new ActionConfig();
@@ -229,7 +232,7 @@ test('Merged tags do not affect version', async () => {
     repo.exec('git checkout master');
     repo.makeCommit('Fifth Commit'); // 0.0.2.0
     repo.exec('git tag v0.0.2');
-    repo.exec('git merge release/0.0.1');
+    repo.merge('release/0.0.1');
     const result = await repo.runAction();
 
     expect(result.formattedVersion).toBe('0.0.3+1');
@@ -524,7 +527,7 @@ test('Tags immediately before merge are detected', async () => {
     repo.exec('git tag v2.0.0');
     repo.exec('git checkout master');
     repo.makeCommit('Commit 5');
-    repo.exec('git merge feature/branch');
+    repo.merge('feature/branch');
     const result = await repo.runAction();
 
     expect(result.versionTag).toBe('v2.0.1');
@@ -543,7 +546,7 @@ test('Correct tag is detected on merged branches', async () => {
     repo.makeCommit('Commit 4');
     repo.exec('git checkout master');
     repo.makeCommit('Commit 5');
-    repo.exec('git merge feature/branch');
+    repo.merge('feature/branch');
     const result = await repo.runAction();
 
     expect(result.versionTag).toBe('v2.0.1');
@@ -558,14 +561,14 @@ test('Correct tag is detected on multiple branches', async () => {
     repo.exec('git tag v1.0.0');
     repo.makeCommit('Commit 2');
     repo.exec('git checkout master');
-    repo.exec('git merge feature/branch1');
+    repo.merge('feature/branch1');
     repo.exec('git checkout -b feature/branch2');
     repo.makeCommit('Commit 3');
     repo.exec('git tag v2.0.0');
     repo.makeCommit('Commit 4');
     repo.exec('git checkout master');
     repo.makeCommit('Commit 5');
-    repo.exec('git merge feature/branch2');
+    repo.merge('feature/branch2');
     const result = await repo.runAction();
 
     expect(result.versionTag).toBe('v2.0.1');
@@ -580,14 +583,14 @@ test('Correct tag is detected when versions pass 10s place', async () => {
     repo.exec('git tag v10.15.0');
     repo.makeCommit('Commit 2');
     repo.exec('git checkout master');
-    repo.exec('git merge feature/branch1');
+    repo.merge('feature/branch1');
     repo.exec('git checkout -b feature/branch2');
     repo.makeCommit('Commit 3');
     repo.exec('git tag v10.7.0');
     repo.makeCommit('Commit 4');
     repo.exec('git checkout master');
     repo.makeCommit('Commit 5');
-    repo.exec('git merge feature/branch2');
+    repo.merge('feature/branch2');
     const result = await repo.runAction();
 
     expect(result.versionTag).toBe('v10.15.1');
@@ -619,7 +622,7 @@ test('Can use branches instead of tags', async () => {
     repo.exec('git checkout -b release/1.0.0');
     repo.makeCommit('Commit 2');
     repo.exec('git checkout master');
-    repo.exec('git merge release/1.0.0');
+    repo.merge('release/1.0.0');
     repo.makeCommit('Commit 3');
     const result = await repo.runAction();
 
@@ -646,7 +649,7 @@ test('Correct previous version is returned when using branches', async () => {
     repo.exec('git checkout -b release/2.0.1');
     repo.makeCommit(`Second Commit`);
     repo.exec('git checkout master');
-    repo.exec('git merge release/2.0.1');
+    repo.merge('release/2.0.1');
     repo.makeCommit(`Third Commit`);
     const result = await repo.runAction();