Skip to content

Commit

Permalink
fix: update wording for rebase/retry PR checkbox (#12190)
Browse files Browse the repository at this point in the history
  • Loading branch information
HonkingGoose committed Oct 17, 2021
1 parent 7f5a939 commit d0028ee
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
Expand Up @@ -2746,7 +2746,7 @@ exports[`platform/bitbucket-server/index endpoint with no path massageMarkdown()
exports[`platform/bitbucket-server/index endpoint with no path massageMarkdown() sanitizes HTML comments in the body 1`] = `
"---
- [ ] If you want to rebase/retry this PR, check this box
- [ ] If you want to rebase/retry this PR, click this checkbox
- [ ] <a href=\\"/some/link\\">Update renovate/renovate to 16.1.2</a>
---
Expand Down Expand Up @@ -7121,7 +7121,7 @@ exports[`platform/bitbucket-server/index endpoint with path massageMarkdown() re
exports[`platform/bitbucket-server/index endpoint with path massageMarkdown() sanitizes HTML comments in the body 1`] = `
"---
- [ ] If you want to rebase/retry this PR, check this box
- [ ] If you want to rebase/retry this PR, click this checkbox
- [ ] <a href=\\"/some/link\\">Update renovate/renovate to 16.1.2</a>
---
Expand Down
2 changes: 1 addition & 1 deletion lib/platform/bitbucket-server/index.spec.ts
Expand Up @@ -1716,7 +1716,7 @@ describe('platform/bitbucket-server/index', () => {
it('sanitizes HTML comments in the body', () => {
const prBody = bitbucket.massageMarkdown(`---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox
- [ ] <!-- recreate-branch=renovate/docker-renovate-renovate-16.x --><a href="/some/link">Update renovate/renovate to 16.1.2</a>
---
Expand Down
2 changes: 1 addition & 1 deletion lib/platform/utils/__fixtures__/pr-body.txt
Expand Up @@ -94,7 +94,7 @@ This PR contains the following updates:

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox

---

Expand Down
4 changes: 2 additions & 2 deletions lib/platform/utils/__snapshots__/pr-body.spec.ts.snap
Expand Up @@ -35,7 +35,7 @@ exports[`platform/utils/pr-body .smartTruncate truncates to 1000 1`] = `
##### Features
- **docker:** AWS ECR authentication support ([#&#8203;4497](https://
- **docker:** AWS ECR authentication support ([#&#8203;4497](htt
</details>
Expand All @@ -53,7 +53,7 @@ exports[`platform/utils/pr-body .smartTruncate truncates to 1000 1`] = `
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox
---
Expand Down
14 changes: 7 additions & 7 deletions lib/workers/pr/__snapshots__/index.spec.ts.snap

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/workers/pr/body/__snapshots__/controls.spec.ts.snap
Expand Up @@ -5,7 +5,7 @@ exports[`workers/pr/body/controls getControls when the branch is modified has t
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box. ⚠ **Warning**: custom changes will be lost.
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost.
"
`;
Expand All @@ -15,7 +15,7 @@ exports[`workers/pr/body/controls getControls when the branch is not modified h
---
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.
- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.
"
`;
2 changes: 1 addition & 1 deletion lib/workers/pr/body/controls.ts
Expand Up @@ -6,5 +6,5 @@ export async function getControls(config: BranchConfig): Promise<string> {
const warning = (await isBranchModified(config.branchName))
? emojify(' :warning: **Warning**: custom changes will be lost.')
: '';
return `\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.${warning}\n\n`;
return `\n\n---\n\n - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.${warning}\n\n`;
}

0 comments on commit d0028ee

Please sign in to comment.