mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-01-10 04:07:18 +02:00
d772c9f1d4
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE. Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything is in 'Sentence case' there's no need for the distinction. I've got a couple lower case things I've kept: namely, things that show up in parentheses.
56 lines
1.7 KiB
Go
56 lines
1.7 KiB
Go
package diff
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/config"
|
|
. "github.com/jesseduffield/lazygit/pkg/integration/components"
|
|
)
|
|
|
|
var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
|
|
Description: "View the diff between two commits",
|
|
ExtraCmdArgs: []string{},
|
|
Skip: false,
|
|
SetupConfig: func(config *config.AppConfig) {},
|
|
SetupRepo: func(shell *Shell) {
|
|
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"),
|
|
).
|
|
Press(keys.Universal.DiffingMenu).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(MatchesRegexp(`Diff \w+`)).Confirm()
|
|
|
|
t.Views().Information().Content(Contains("Showing output for: git diff"))
|
|
}).
|
|
SelectNextItem().
|
|
SelectNextItem().
|
|
SelectedLine(Contains("first commit")).
|
|
Tap(func() {
|
|
t.Views().Main().Content(Contains("-second line\n-third line"))
|
|
}).
|
|
Press(keys.Universal.DiffingMenu).
|
|
Tap(func() {
|
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Reverse diff direction")).Confirm()
|
|
|
|
t.Views().Main().Content(Contains("+second line\n+third line"))
|
|
}).
|
|
PressEnter()
|
|
|
|
t.Views().CommitFiles().
|
|
IsFocused().
|
|
SelectedLine(Contains("file1"))
|
|
|
|
t.Views().Main().Content(Contains("+second line\n+third line"))
|
|
},
|
|
})
|