Skip to content

Commit

Permalink
Add a simple integration test for non-sticky range diff
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanhaller committed Aug 28, 2024
1 parent 717cb40 commit 32fef9a
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 0 deletions.
45 changes: 45 additions & 0 deletions pkg/integration/tests/diff/diff_non_sticky_range.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package diff

import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)

var DiffNonStickyRange = NewIntegrationTest(NewIntegrationTestArgs{
Description: "View the combined diff of multiple commits using a range selection",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.EmptyCommit("initial commit")
shell.CreateFileAndAdd("file1", "first line\n")
shell.Commit("first commit")
shell.UpdateFileAndAdd("file1", "first line\nsecond line\n")
shell.Commit("second commit")
shell.UpdateFileAndAdd("file1", "first line\nsecond line\nthird line\n")
shell.Commit("third commit")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Commits().
Focus().
Lines(
Contains("third commit").IsSelected(),
Contains("second commit"),
Contains("first commit"),
Contains("initial commit"),
).
Press(keys.Universal.RangeSelectDown).
Press(keys.Universal.RangeSelectDown).
Tap(func() {
t.Views().Main().Content(Contains("Showing diff for range ").
Contains("+first line\n+second line\n+third line"))
}).
PressEnter()

t.Views().CommitFiles().
IsFocused().
SelectedLine(Contains("file1"))

t.Views().Main().Content(Contains("+first line\n+second line\n+third line"))
},
})
1 change: 1 addition & 0 deletions pkg/integration/tests/test_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ var tests = []*components.IntegrationTest{
diff.Diff,
diff.DiffAndApplyPatch,
diff.DiffCommits,
diff.DiffNonStickyRange,
diff.IgnoreWhitespace,
diff.RenameSimilarityThresholdChange,
file.CopyMenu,
Expand Down

0 comments on commit 32fef9a

Please sign in to comment.