Update dependency @ember/test-helpers to v2.5.0

[renovate]

This PR contains the following updates:

Package	Change	Age	Adoption	Passing	Confidence
@ember/test-helpers	2.4.2 -> 2.5.0

---

Release Notes

emberjs/ember-test-helpers

v2.5.0

Compare Source

🚀 Enhancement

• #​795 Add option to render to enable improved ember-engines testing API (@​villander) (@​richgt) (@​rwjblue)

Committers: 3

• Michael Villander (@​villander)
• Rich Glazerman (@​richgt)
• Robert Jackson (@​rwjblue)

v2.4.3

Compare Source

🐛 Bug Fix

• #​1126 Preserve focus when default is prevented on mousedown (@​bendemboski)
• #​1127 Fix focus behavior when ancestor is focusable (@​bendemboski)

🏠 Internal

• #​1135 Update to ember-auto-import@2 (@​rwjblue)
• #​1111 Fixes postpack script to cleanup correct file type (@​scalvert)

Committers: 3

• Ben Demboski (@​bendemboski)
• Robert Jackson (@​rwjblue)
• Steve Calvert (@​scalvert)

---

Configuration

📅 Schedule: At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.

---

• If you want to rebase/retry this PR, check this box.

---

This PR has been generated by WhiteSource Renovate. View repository job log here.

[Turbo87]

@bors r+

[bors]

📌 Commit d134354 has been approved by Turbo87

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout renovate/ember-test-helpers-2.x (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self renovate/ember-test-helpers-2.x --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging yarn.lock
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Automatic merge failed; fix conflicts and then commit the result.

[bors]

☔ The latest upstream changes (presumably #3984) made this pull request unmergeable. Please resolve the merge conflicts.

[Turbo87]

@bors r+

[bors]

📌 Commit 7d17514 has been approved by Turbo87

[bors]

⌛ Testing commit 7d17514 with merge 81cce60...

[bors]

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing 81cce60 to master...