1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00

cleanup integration test code

This commit is contained in:
Jesse Duffield
2023-02-26 11:49:15 +11:00
parent 8b5d59c238
commit f7e8b2dd71
70 changed files with 322 additions and 272 deletions

View File

@ -50,7 +50,7 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().PatchBuildingSecondary().Content(Contains("second line"))
t.Actions().SelectPatchOption(MatchesRegexp(`apply patch$`))
t.Common().SelectPatchOption(MatchesRegexp(`apply patch$`))
t.Views().Files().
Focus().

View File

@ -35,7 +35,7 @@ var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
t.Actions().SelectPatchOption(Contains("apply patch in reverse"))
t.Common().SelectPatchOption(Contains("apply patch in reverse"))
t.Views().Files().
Focus().

View File

@ -40,7 +40,7 @@ var CopyPatchToClipboard = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Information().Content(Contains("building patch"))
t.Actions().SelectPatchOption(Contains("copy patch to clipboard"))
t.Common().SelectPatchOption(Contains("copy patch to clipboard"))
t.ExpectToast(Contains("Patch copied to clipboard"))

View File

@ -35,7 +35,7 @@ var MoveToIndex = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
t.Actions().SelectPatchOption(Contains("move patch out into index"))
t.Common().SelectPatchOption(Contains("move patch out into index"))
t.Views().Files().
Lines(

View File

@ -28,7 +28,7 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{
Contains("second commit"),
Contains("first commit"),
).
NavigateToListItem(Contains("second commit")).
NavigateToLine(Contains("second commit")).
PressEnter()
t.Views().CommitFiles().
@ -61,7 +61,7 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{
Contains(` third line`),
)
t.Actions().SelectPatchOption(Contains("move patch out into index"))
t.Common().SelectPatchOption(Contains("move patch out into index"))
t.Views().Files().
Lines(

View File

@ -40,9 +40,9 @@ var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Information().Content(Contains("building patch"))
t.Actions().SelectPatchOption(Contains("move patch out into index"))
t.Common().SelectPatchOption(Contains("move patch out into index"))
t.Actions().AcknowledgeConflicts()
t.Common().AcknowledgeConflicts()
t.Views().Files().
IsFocused().
@ -62,7 +62,7 @@ var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Actions().ContinueOnConflictsResolved()
t.Common().ContinueOnConflictsResolved()
t.ExpectPopup().Alert().
Title(Equals("Error")).

View File

@ -40,7 +40,7 @@ var MoveToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Information().Content(Contains("building patch"))
t.Actions().SelectPatchOption(Contains("move patch into new commit"))
t.Common().SelectPatchOption(Contains("move patch into new commit"))
t.Views().CommitFiles().
IsFocused().

View File

@ -35,7 +35,7 @@ var RemoveFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
t.Actions().SelectPatchOption(Contains("remove patch from original commit"))
t.Common().SelectPatchOption(Contains("remove patch from original commit"))
t.Views().Files().IsEmpty()

View File

@ -43,7 +43,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Secondary().Content(Contains("direct file content"))
}).
NavigateToListItem(Contains("hunk-file")).
NavigateToLine(Contains("hunk-file")).
PressEnter()
t.Views().PatchBuilding().
@ -92,7 +92,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().CommitFiles().
IsFocused().
NavigateToListItem(Contains("line-file")).
NavigateToLine(Contains("line-file")).
PressEnter()
t.Views().PatchBuilding().
@ -106,11 +106,11 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
Contains("+2a"),
).
PressPrimaryAction().
NavigateToListItem(Contains("+2c")).
NavigateToLine(Contains("+2c")).
Press(keys.Main.ToggleDragSelect).
NavigateToListItem(Contains("+2e")).
NavigateToLine(Contains("+2e")).
PressPrimaryAction().
NavigateToListItem(Contains("+2g")).
NavigateToLine(Contains("+2g")).
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("building patch"))

View File

@ -41,7 +41,7 @@ var StartNewPatch = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Commits().
IsFocused().
NavigateToListItem(Contains("first commit")).
NavigateToLine(Contains("first commit")).
PressEnter()
t.Views().CommitFiles().