feat: rename step 4 Merge

christophehurpeau · Jan 21, 2023 · 262cc6b · 262cc6b
1 parent 0e40f26
commit 262cc6b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...rs/actions/utils/body/mocks/commentBody-v1-initialAfterEdit-simpleWithInfosAndProgress.ts b/...rs/actions/utils/body/mocks/commentBody-v1-initialAfterEdit-simpleWithInfosAndProgress.ts
@@ -7,7 +7,7 @@ Some informations here, like links.
 ☑️ Step 1: ✏️ Write code
 ☑️ Step 2: 💚 Checks
 ⬜ Step 3: 👌 Code Review
-⬜ Step 4: 🚦 Merging Pull Request
+⬜ Step 4: 🚦 Merge Pull Request
 
 ### Options:
 - [ ] <!-- reviewflow-featureBranch -->This PR is a feature branch

diff --git a/src/events/pr-handlers/actions/utils/body/mocks/commentBody-v1-initialAfterEdit-table.ts b/src/events/pr-handlers/actions/utils/body/mocks/commentBody-v1-initialAfterEdit-table.ts
@@ -4,7 +4,7 @@ export default `
 ☑️ Step 1: ✏️ Write code
 ☑️ Step 2: 💚 Checks
 ⬜ Step 3: 👌 Code Review
-⬜ Step 4: 🚦 Merging Pull Request
+⬜ Step 4: 🚦 Merge Pull Request
 
 ### Options:
 - [ ] <!-- reviewflow-featureBranch -->This PR is a feature branch

diff --git a/...r-handlers/actions/utils/body/mocks/commentBody-v2-initialAfterEdit-simpleWithProgress.ts b/...r-handlers/actions/utils/body/mocks/commentBody-v2-initialAfterEdit-simpleWithProgress.ts
@@ -4,7 +4,7 @@ export default `
 ☑️ Step 1: ✏️ Write code
 ☑️ Step 2: 💚 Checks
 ⬜ Step 3: 👌 Code Review
-⬜ Step 4: 🚦 Merging Pull Request
+⬜ Step 4: 🚦 Merge Pull Request
 
 ### Options:
 - [ ] <!-- reviewflow-autoMerge -->[:vertical_traffic_light: automerge](https://github.com/christophehurpeau/reviewflow/labels/%3Avertical_traffic_light%3A%20automerge): Automatically merge when this PR is ready and has no failed statuses. When the repository requires _branches to be up to date before merging_, it merges default branch, with a queue per repo to prevent multiple merges when several PRs are ready. A fail job prevents the merge.

diff --git a/src/events/pr-handlers/actions/utils/steps/calcStepsState.ts b/src/events/pr-handlers/actions/utils/steps/calcStepsState.ts
@@ -41,7 +41,7 @@ export const steps = [
     fn: calcCodeReviewStep,
   },
   {
-    name: 'Step 4: 🚦 Merging Pull Request',
+    name: 'Step 4: 🚦 Merge Pull Request',
     key: 'merge',
     fn: calcMergeStep,
   },

diff --git a/src/events/pr-handlers/edited.test.ts b/src/events/pr-handlers/edited.test.ts
@@ -43,7 +43,7 @@ describe('edited', (): void => {
       .times(1)
       .reply(200, {
         id: 1,
-        body: '### Progress\n\n☑️ Step 1: ✏️ Write code\n☑️ Step 2: 💚 Checks\n⬜ Step 3: 👌 Code Review\n⬜ Step 4: 🚦 Merging Pull Request\n\n### Options:\n- [ ] <!-- reviewflow-autoMergeWithSkipCi -->Add `[skip ci]` on merge commit\n- [ ] <!-- reviewflow-autoMerge -->Auto merge when this PR is ready and has no failed statuses. (Also has a queue per repo to prevent multiple useless "Update branch" triggers)\n- [x] <!-- reviewflow-deleteAfterMerge -->Automatic branch delete after this PR is merged',
+        body: '### Progress\n\n☑️ Step 1: ✏️ Write code\n☑️ Step 2: 💚 Checks\n⬜ Step 3: 👌 Code Review\n⬜ Step 4: 🚦 Merge Pull Request\n\n### Options:\n- [ ] <!-- reviewflow-autoMergeWithSkipCi -->Add `[skip ci]` on merge commit\n- [ ] <!-- reviewflow-autoMerge -->Auto merge when this PR is ready and has no failed statuses. (Also has a queue per repo to prevent multiple useless "Update branch" triggers)\n- [x] <!-- reviewflow-deleteAfterMerge -->Automatic branch delete after this PR is merged',
       })
 
       .get('/repos/reviewflow/reviewflow-test/pulls/30/commits?per_page=100')

diff --git a/src/events/pr-handlers/readyForReview.test.ts b/src/events/pr-handlers/readyForReview.test.ts
@@ -39,7 +39,7 @@ describe('edited', (): void => {
       .times(1)
       .reply(200, {
         id: 1,
-        body: '### Progress\n\n☑️ Step 1: ✏️ Write code\n☑️ Step 2: 💚 Checks\n⬜ Step 3: 👌 Code Review\n⬜ Step 4: 🚦 Merging Pull Request\n\n### Options:\n- [ ] <!-- reviewflow-autoMergeWithSkipCi -->Add `[skip ci]` on merge commit\n- [ ] <!-- reviewflow-autoMerge -->Auto merge when this PR is ready and has no failed statuses. (Also has a queue per repo to prevent multiple useless "Update branch" triggers)\n- [x] <!-- reviewflow-deleteAfterMerge -->Automatic branch delete after this PR is merged',
+        body: '### Progress\n\n☑️ Step 1: ✏️ Write code\n☑️ Step 2: 💚 Checks\n⬜ Step 3: 👌 Code Review\n⬜ Step 4: 🚦 Merge Pull Request\n\n### Options:\n- [ ] <!-- reviewflow-autoMergeWithSkipCi -->Add `[skip ci]` on merge commit\n- [ ] <!-- reviewflow-autoMerge -->Auto merge when this PR is ready and has no failed statuses. (Also has a queue per repo to prevent multiple useless "Update branch" triggers)\n- [x] <!-- reviewflow-deleteAfterMerge -->Automatic branch delete after this PR is merged',
       })
 
       .get(