feat(config): rebaseWhen = automerging

[PhilipAbed]

Changes

Context

• rebaseWhen new value for Automerge. #31398

Documentation (please check one with an [x])

• I have updated the documentation, or
• No documentation update is required

How I've tested my work (please select one)

I have verified these changes via:

• Code inspection only, or
• Newly added/modified unit tests, or
• No unit tests but ran on a real repository, or
• Both unit tests + ran on a real repository

[PhilipAbed]

testing e2e again.

[PhilipAbed]

realtime testing for PR text:

case 1:

rebaseWhen='automerging'
automerge=true

results in :
🚦 Automerge: Enabled.
♻ Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.

case 2:

automerge=true

results in:
🚦 Automerge: Enabled.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

I believe there's a bug in the PR text here unrelated to my changes

i debugged and apparently we are getting auto as default with automerge true.
it should say
♻ Rebasing: Whenever PR is behind base branch, or you tick the rebase/retry checkbox.
but it's not.
the Auto is being handled when we are re-using the same branch.
But the text is wrong on the PR,

according to docs:

auto: Renovate will autodetect the best setting. It will use behind-base-branch if configured to automerge or repository has been set to require PRs to be up to date. Otherwise, conflicted will be used instead

case 3:

rebaseWhen='automerging'

results in:
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Never, or you tick the rebase/retry checkbox.

case 4:
default behaviour
results in:
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

should i handle it in this PR or accept this and create a separate PR with a minimal change?

[rarkins]

If you've found a bug in existing functionality then please submit a separate fix PR for that first

[PhilipAbed]

ok, the bug was that when creating a new branch we dont determine/transform the value of rebaseWhen
i moved the function above in #32218

now its easier and less changes.

[viceice]

looks simple

[renovate-release]

🎉 This PR is included in version 38.140.0 🎉

The release is available on:

• GitHub release
• npm package (@latest dist-tag)
• 38.140.0

Your semantic-release bot 📦🚀