summaryrefslogtreecommitdiffstats
path: root/pkg/integration/tests/sync/pull_rebase.go
diff options
context:
space:
mode:
authorStefan Haller <stefan@haller-berlin.de>2024-05-04 12:35:57 +0200
committerStefan Haller <stefan@haller-berlin.de>2024-06-03 13:02:46 +0200
commit19d0048cc486b087ca938a14ce2be91ea0f0a3ae (patch)
tree2ea12130e8ca41c6a85d35b2a337255d322964f3 /pkg/integration/tests/sync/pull_rebase.go
parent7c51ec21bf0f787c6f2d0079e920f3d5f566c9f0 (diff)
More explicit test of status panel content
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.
Diffstat (limited to 'pkg/integration/tests/sync/pull_rebase.go')
-rw-r--r--pkg/integration/tests/sync/pull_rebase.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/integration/tests/sync/pull_rebase.go b/pkg/integration/tests/sync/pull_rebase.go
index 77810426e..158cdf3d3 100644
--- a/pkg/integration/tests/sync/pull_rebase.go
+++ b/pkg/integration/tests/sync/pull_rebase.go
@@ -35,13 +35,13 @@ var PullRebase = NewIntegrationTest(NewIntegrationTestArgs{
Contains("one"),
)
- t.Views().Status().Content(Contains("↓2 repo → master"))
+ t.Views().Status().Content(Equals("↑1↓2 repo → master"))
t.Views().Files().
IsFocused().
Press(keys.Universal.Pull)
- t.Views().Status().Content(Contains("↑1 repo → master"))
+ t.Views().Status().Content(Equals("↑1 repo → master"))
t.Views().Commits().
Lines(