Add integration test for the new divergence log

2 files changed, 55 insertions, 0 deletions

diff --git a/pkg/integration/tests/branch/show_divergence_from_upstream.go b/pkg/integration/tests/branch/show_divergence_from_upstream.go
new file mode 100644
index 000000000..10fc29986
--- /dev/null
+++ b/pkg/integration/tests/branch/show_divergence_from_upstream.go
@@ -0,0 +1,54 @@
+package branch
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var ShowDivergenceFromUpstream = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Show divergence from upstream",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("file", "content1")
+		shell.Commit("one")
+		shell.UpdateFileAndAdd("file", "content2")
+		shell.Commit("two")
+		shell.CreateFileAndAdd("file3", "content3")
+		shell.Commit("three")
+
+		shell.CloneIntoRemote("origin")
+
+		shell.SetBranchUpstream("master", "origin/master")
+
+		shell.HardReset("HEAD^^")
+		shell.CreateFileAndAdd("file4", "content4")
+		shell.Commit("four")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Lines(
+				Contains("four"),
+				Contains("one"),
+			)
+
+		t.Views().Branches().
+			Focus().
+			Lines(Contains("master")).
+			Press(keys.Branches.SetUpstream)
+
+		t.ExpectPopup().Menu().Title(Contains("upstream")).Select(Contains("View divergence from upstream")).Confirm()
+
+		t.Views().SubCommits().
+			IsFocused().
+			Title(Contains("Commits (master <-> origin/master)")).
+			Lines(
+				DoesNotContainAnyOf("↓", "↑").Contains("--- Remote ---"),
+				Contains("↓").Contains("three"),
+				Contains("↓").Contains("two"),
+				DoesNotContainAnyOf("↓", "↑").Contains("--- Local ---"),
+				Contains("↑").Contains("four"),
+			)
+	},
+})
diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go
index 779286fbc..0a50b7441 100644
--- a/pkg/integration/tests/test_list.go
+++ b/pkg/integration/tests/test_list.go
@@ -49,6 +49,7 @@ var tests = []*components.IntegrationTest{
 	branch.Reset,
 	branch.ResetUpstream,
 	branch.SetUpstream,
+	branch.ShowDivergenceFromUpstream,
 	branch.Suggestions,
 	cherry_pick.CherryPick,
 	cherry_pick.CherryPickConflicts,