mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-23 12:18:51 +02:00
19d0048cc4
Use Equals instead of Contains for asserting the status view content. This
solves the problem that we might assert Contains("↓2 repo"), but what it really
shows is "↑1↓2 repo", and the test still succeeds. At best this is confusing.
Also, this way we don't have to use the awkward DoesNotContain to check that it
really doesn't show a checkmark.
To do this, we need to fix two whitespace problems:
- there was always a space at the end for no reason. Simply remove it. It was
added in efb51eee96, but from looking at that diff it seems it was added
accidentally.
- there was a space at the beginning if the branch status was empty. This is
actually a cosmetic problem, for branches without a status the text was
indented by once space. Change this so that the space is added conditionally.
It's a bit awkward that we have to use Decolorise here, but this will go away
again later in this branch.
50 lines
959 B
Go
50 lines
959 B
Go
package sync
|
|
|
|
import (
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
func createTwoBranchesReadyToForcePush(shell *Shell) {
|
|
shell.EmptyCommit("one")
|
|
shell.EmptyCommit("two")
|
|
|
|
shell.NewBranch("other_branch")
|
|
|
|
shell.CloneIntoRemote("origin")
|
|
|
|
shell.SetBranchUpstream("master", "origin/master")
|
|
shell.SetBranchUpstream("other_branch", "origin/other_branch")
|
|
|
|
// remove the 'two' commit so that we have something to pull from the remote
|
|
shell.HardReset("HEAD^")
|
|
|
|
shell.Checkout("master")
|
|
// doing the same for master
|
|
shell.HardReset("HEAD^")
|
|
}
|
|
|
|
func assertSuccessfullyPushed(t *TestDriver) {
|
|
t.Views().Status().Content(Equals("✓ repo → master"))
|
|
|
|
t.Views().Remotes().
|
|
Focus().
|
|
Lines(
|
|
Contains("origin"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().RemoteBranches().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("master"),
|
|
).
|
|
PressEnter()
|
|
|
|
t.Views().SubCommits().
|
|
IsFocused().
|
|
Lines(
|
|
Contains("two"),
|
|
Contains("one"),
|
|
)
|
|
}
|