Skip to content

Commit

Permalink
Update rebase_onto demo test to match new the rebase menu title (#3636
Browse files Browse the repository at this point in the history
)

- **PR Description**

This PR updates the `rebase_onto` demo integration test, which is
currently failing on master due to [this
change](https://github.com/jesseduffield/lazygit/pull/3615/files#diff-3eb5426752dae525c92f1ecce2f7215d15bfdec91bd459e08f78574876583910R1259).
Our CI does not throw the issue, but it's still annoying to cope with it
for local development.

@jesseduffield @stefanhaller, I'm unaware of a particular workflow for
updating demo tests, but let me know if this needs some tweaks.

- **Please check if the PR fulfills these requirements**

* [ ] Cheatsheets are up-to-date (run `go generate ./...`)
* [ ] Code has been formatted (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
* [ ] Tests have been added/updated (see
[here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
for the integration test guide)
* [ ] Text is internationalised (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
* [ ] Docs have been updated if necessary
* [ ] You've read through your own file changes for silly mistakes etc

<!--
Be sure to name your PR with an imperative e.g. 'Add worktrees view'
see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for
examples
-->
  • Loading branch information
stefanhaller committed Jun 5, 2024
2 parents 66a04e4 + f6457c4 commit 187a2f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/integration/tests/demo/rebase_onto.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ var RebaseOnto = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RebaseBranch).
Tap(func() {
t.ExpectPopup().Menu().
Title(Contains("Rebase 'feature/demo' from marked base onto 'master'")).
Title(Contains("Rebase 'feature/demo' from marked base")).
Select(Contains("Simple rebase")).
Confirm()
}).
Expand Down

0 comments on commit 187a2f0

Please sign in to comment.