sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Use sentence case everywhere

Browse Source 
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.
This commit is contained in:
Jesse Duffield
2023-05-25 21:11:51 +10:00
parent e5534d9781
commit d772c9f1d4
143 changed files with 2691 additions and 2683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/integration/components/common.go
View File

@ -9,7 +9,7 @@ func (self *Common) ContinueMerge() {
self.t.GlobalPress(self.t.keys.Universal.CreateRebaseOptionsMenu)
self.t.ExpectPopup().Menu().
Title(Equals("Rebase Options")).
Title(Equals("Rebase options")).
Select(Contains("continue")).
Confirm()
}
@ -27,8 +27,8 @@ func (self *Common) AcknowledgeConflicts() {
func (self *Common) ContinueOnConflictsResolved() {
self.t.ExpectPopup().Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Title(Equals("Continue")).
Content(Contains("All merge conflicts resolved. Continue?")).
Confirm()
}
@ -42,5 +42,5 @@ func (self *Common) ConfirmDiscardLines() {
func (self *Common) SelectPatchOption(matcher *Matcher) {
self.t.GlobalPress(self.t.keys.Universal.CreatePatchOptionsMenu)
self.t.ExpectPopup().Menu().Title(Equals("Patch Options")).Select(matcher).Confirm()
self.t.ExpectPopup().Menu().Title(Equals("Patch options")).Select(matcher).Confirm()
}

8
pkg/integration/tests/bisect/basic.go
View File

@ -19,14 +19,14 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Commits().
Press(keys.Commits.ViewBisectOptions)
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`mark .* as bad`)).Confirm()
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as bad`)).Confirm()
}
markCommitAsGood := func() {
t.Views().Commits().
Press(keys.Commits.ViewBisectOptions)
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`mark .* as good`)).Confirm()
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as good`)).Confirm()
}
t.Views().Commits().
@ -36,7 +36,7 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
markCommitAsBad()
t.Views().Information().Content(Contains("bisecting"))
t.Views().Information().Content(Contains("Bisecting"))
}).
SelectedLine(Contains("<-- bad")).
NavigateToLine(Contains("commit 02")).
@ -54,6 +54,6 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
Content(Contains("commit 04"))
t.Views().Information().Content(DoesNotContain("bisecting"))
t.Views().Information().Content(DoesNotContain("Bisecting"))
},
})

6
pkg/integration/tests/bisect/from_other_branch.go
View File

@ -19,7 +19,7 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{
},
SetupConfig: func(cfg *config.AppConfig) {},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Information().Content(Contains("bisecting"))
t.Views().Information().Content(Contains("Bisecting"))
t.Views().Commits().
Focus().
@ -32,11 +32,11 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{
SelectNextItem().
Press(keys.Commits.ViewBisectOptions).
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`mark .* as good`)).Confirm()
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as good`)).Confirm()
t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 08.*Do you want to reset")).Confirm()
t.Views().Information().Content(DoesNotContain("bisecting"))
t.Views().Information().Content(DoesNotContain("Bisecting"))
}).
// back in master branch which just had the one commit
Lines(

2
pkg/integration/tests/branch/create_tag.go
View File

@ -28,7 +28,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().
Title(Equals("Create tag")).
Select(Contains("lightweight")).
Select(Contains("Lightweight")).
Confirm()
t.ExpectPopup().Prompt().

2
pkg/integration/tests/branch/delete.go
View File

@ -32,7 +32,7 @@ var Delete = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Equals("Delete Branch")).
Title(Equals("Delete branch")).
Content(Contains("Are you sure you want to delete the branch 'branch-one'?")).
Confirm()
}).

2
pkg/integration/tests/branch/detached_head.go
View File

@ -25,7 +25,7 @@ var DetachedHead = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.New)
t.ExpectPopup().Prompt().
Title(MatchesRegexp(`^New Branch Name \(Branch is off of '[0-9a-f]+'\)$`)).
Title(MatchesRegexp(`^New branch name \(branch is off of '[0-9a-f]+'\)$`)).
Type("new-branch").
Confirm()

6
pkg/integration/tests/branch/rebase.go
View File

@ -32,7 +32,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Select(Contains("simple rebase")).
Select(Contains("Simple rebase")).
Confirm()
t.Common().AcknowledgeConflicts()
@ -46,11 +46,11 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
PressPrimaryAction()
t.Views().Information().Content(Contains("rebasing"))
t.Views().Information().Content(Contains("Rebasing"))
t.Common().ContinueOnConflictsResolved()
t.Views().Information().Content(DoesNotContain("rebasing"))
t.Views().Information().Content(DoesNotContain("Rebasing"))
t.Views().Commits().TopLines(
Contains("second-change-branch unrelated change"),

6
pkg/integration/tests/branch/rebase_and_drop.go
View File

@ -38,10 +38,10 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
Select(Contains("simple rebase")).
Select(Contains("Simple rebase")).
Confirm()
t.Views().Information().Content(Contains("rebasing"))
t.Views().Information().Content(Contains("Rebasing"))
t.Common().AcknowledgeConflicts()
@ -77,7 +77,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
t.Common().ContinueOnConflictsResolved()
t.Views().Information().Content(DoesNotContain("rebasing"))
t.Views().Information().Content(DoesNotContain("Rebasing"))
t.Views().Commits().TopLines(
Contains("to keep"),

2
pkg/integration/tests/branch/rebase_does_not_autosquash.go
View File

@ -41,7 +41,7 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().
Title(Equals("Rebase 'my-branch' onto 'master'")).
Select(Contains("simple rebase")).
Select(Contains("Simple rebase")).
Confirm()
t.Views().Commits().Lines(

4
pkg/integration/tests/branch/reset.go
View File

@ -36,8 +36,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.ViewResetOptions)
t.ExpectPopup().Menu().
Title(Contains("reset to other-branch")).
Select(Contains("hard reset")).
Title(Contains("Reset to other-branch")).
Select(Contains("Hard reset")).
Confirm()
// assert that we now have the expected commits in the commit panel

4
pkg/integration/tests/branch/reset_upstream.go
View File

@ -25,8 +25,8 @@ var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.SetUpstream).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Set/unset upstream")).
Select(Contains("unset upstream of selected branch")).
Title(Equals("Set/Unset upstream")).
Select(Contains("Unset upstream of selected branch")).
Confirm()
}).
Lines(

4
pkg/integration/tests/branch/set_upstream.go
View File

@ -24,8 +24,8 @@ var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.SetUpstream).
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Set/unset upstream")).
Select(Contains(" set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
Title(Equals("Set/Unset upstream")).
Select(Contains(" Set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
Confirm()
t.ExpectPopup().Prompt().

2
pkg/integration/tests/cherry_pick/cherry_pick.go
View File

@ -61,7 +61,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.PasteCommits).
Tap(func() {
t.ExpectPopup().Alert().
Title(Equals("Cherry-Pick")).
Title(Equals("Cherry-pick")).
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
Confirm()
}).

2
pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
View File

@ -48,7 +48,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.PasteCommits)
t.ExpectPopup().Alert().
Title(Equals("Cherry-Pick")).
Title(Equals("Cherry-pick")).
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
Confirm()

2
pkg/integration/tests/commit/amend.go
View File

@ -26,7 +26,7 @@ var Amend = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.AmendToCommit)
t.ExpectPopup().Confirmation().Title(
Equals("Amend Last Commit")).
Equals("Amend last commit")).
Content(Contains("Are you sure you want to amend last commit?")).
Confirm()

2
pkg/integration/tests/commit/create_tag.go
View File

@ -25,7 +25,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().
Title(Equals("Create tag")).
Select(Contains("lightweight")).
Select(Contains("Lightweight")).
Confirm()
t.ExpectPopup().Prompt().

2
pkg/integration/tests/commit/new_branch.go
View File

@ -28,7 +28,7 @@ var NewBranch = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.New).
Tap(func() {
branchName := "my-branch-name"
t.ExpectPopup().Prompt().Title(Contains("New Branch Name")).Type(branchName).Confirm()
t.ExpectPopup().Prompt().Title(Contains("New branch name")).Type(branchName).Confirm()
t.Git().CurrentBranchName(branchName)
}).

2
pkg/integration/tests/commit/reset_author.go
View File

@ -29,7 +29,7 @@ var ResetAuthor = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Amend commit attribute")).
Select(Contains("reset author")).
Select(Contains("Reset author")).
Confirm()
}).
Lines(

2
pkg/integration/tests/commit/revert_merge.go
View File

@ -26,7 +26,7 @@ var RevertMerge = NewIntegrationTest(NewIntegrationTestArgs{
Lines(
Contains("first change"),
Contains("second-change-branch unrelated change"),
Contains("cancel"),
Contains("Cancel"),
).
Select(Contains("first change")).
Confirm()

2
pkg/integration/tests/commit/set_author.go
View File

@ -32,7 +32,7 @@ var SetAuthor = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Amend commit attribute")).
Select(Contains(" set author")). // adding space at start to distinguish from 'reset author'
Select(Contains(" Set author")). // adding space at start to distinguish from 'reset author'
Confirm()
t.ExpectPopup().Prompt().

2
pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go
View File

@ -20,7 +20,7 @@ var BasicCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.ExecuteCustomCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom Command:")).
Title(Equals("Custom command:")).
Type("touch file.txt").
Confirm()

2
pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go
View File

@ -20,7 +20,7 @@ var ComplexCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.ExecuteCustomCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom Command:")).
Title(Equals("Custom command:")).
Type("sh -c \"touch file.txt\"").
Confirm()

6
pkg/integration/tests/custom_commands/omit_from_history.go
View File

@ -16,13 +16,13 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom Command:")).
Title(Equals("Custom command:")).
Type("echo aubergine").
Confirm()
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom Command:")).
Title(Equals("Custom command:")).
SuggestionLines(Contains("aubergine")).
SuggestionLines(DoesNotContain("tangerine")).
Type(" echo tangerine").
@ -30,7 +30,7 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
t.ExpectPopup().Prompt().
Title(Equals("Custom Command:")).
Title(Equals("Custom command:")).
SuggestionLines(Contains("aubergine")).
SuggestionLines(DoesNotContain("tangerine")).
Cancel()

10
pkg/integration/tests/diff/diff.go
View File

@ -30,16 +30,16 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.DiffingMenu)
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains(`diff branch-a`)).Confirm()
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains(`Diff branch-a`)).Confirm()
t.Views().Branches().
IsFocused().
Tap(func() {
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-a"))
}).
SelectNextItem().
Tap(func() {
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b"))
t.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
@ -66,8 +66,8 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
Press(keys.Universal.DiffingMenu)
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b -R"))
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Reverse diff direction")).Confirm()
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b -R"))
t.Views().Main().Content(Contains("-second line"))
},
})

14
pkg/integration/tests/diff/diff_and_apply_patch.go
View File

@ -30,15 +30,15 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.DiffingMenu)
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Equals("diff branch-a")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Equals("Diff branch-a")).Confirm()
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-a"))
t.Views().Branches().
IsFocused().
SelectNextItem().
Tap(func() {
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b"))
t.Views().Main().Content(Contains("+second line"))
}).
PressEnter()
@ -60,14 +60,14 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction(). // add the file to the patch
Press(keys.Universal.DiffingMenu).
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Exit diff mode")).Confirm()
t.Views().Information().Content(DoesNotContain("building patch"))
t.Views().Information().Content(DoesNotContain("Building patch"))
}).
Press(keys.Universal.CreatePatchOptionsMenu)
// adding the regex '$' here to distinguish the menu item from the 'apply patch in reverse' item
t.ExpectPopup().Menu().Title(Equals("Patch Options")).Select(MatchesRegexp("apply patch$")).Confirm()
// adding the regex '$' here to distinguish the menu item from the 'Apply patch in reverse' item
t.ExpectPopup().Menu().Title(Equals("Patch options")).Select(MatchesRegexp("Apply patch$")).Confirm()
t.Views().Files().
Focus().

6
pkg/integration/tests/diff/diff_commits.go
View File

@ -28,9 +28,9 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.DiffingMenu).
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(MatchesRegexp(`Diff \w+`)).Confirm()
t.Views().Information().Content(Contains("showing output for: git diff"))
t.Views().Information().Content(Contains("Showing output for: git diff"))
}).
SelectNextItem().
SelectNextItem().
@ -40,7 +40,7 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
}).
Press(keys.Universal.DiffingMenu).
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Reverse diff direction")).Confirm()
t.Views().Main().Content(Contains("+second line\n+third line"))
}).

6
pkg/integration/tests/file/discard_changes.go
View File

@ -85,7 +85,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{
SelectedLine(Contains(file.status + " " + file.label)).
Press(keys.Universal.Remove)
t.ExpectPopup().Menu().Title(Equals(file.menuTitle)).Select(Contains("discard all changes")).Confirm()
t.ExpectPopup().Menu().Title(Equals(file.menuTitle)).Select(Contains("Discard all changes")).Confirm()
}
}
@ -100,8 +100,8 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{
})
t.ExpectPopup().Confirmation().
Title(Equals("continue")).
Content(Contains("all merge conflicts resolved. Continue?")).
Title(Equals("Continue")).
Content(Contains("All merge conflicts resolved. Continue?")).
Cancel()
discardOneByOne([]statusFile{

2
pkg/integration/tests/file/discard_staged_changes.go
View File

@ -37,7 +37,7 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Files.ViewResetOptions)
t.ExpectPopup().Menu().Title(Equals("")).Select(Contains("discard staged changes")).Confirm()
t.ExpectPopup().Menu().Title(Equals("")).Select(Contains("Discard staged changes")).Confirm()
// staged file has been removed
t.Views().Files().

8
pkg/integration/tests/file/gitignore.go
View File

@ -27,14 +27,14 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Files.IgnoreFile).
// ensure we can't exclude the .gitignore file
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .git/info/exclude")).Confirm()
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot exclude .gitignore")).Confirm()
}).
Press(keys.Files.IgnoreFile).
// ensure we can't ignore the .gitignore file
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .gitignore")).Confirm()
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm()
@ -45,7 +45,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Files.IgnoreFile).
// exclude a file
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .git/info/exclude")).Confirm()
t.FileSystem().FileContent(".gitignore", Equals(""))
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
@ -54,7 +54,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Files.IgnoreFile).
// ignore a file
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .gitignore")).Confirm()
t.FileSystem().FileContent(".gitignore", Equals("toIgnore\n"))
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))

2
pkg/integration/tests/file/remember_commit_message_after_fail.go
View File

@ -42,7 +42,7 @@ var RememberCommitMessageAfterFail = NewIntegrationTest(NewIntegrationTestArgs{
}).
Press(keys.Universal.Remove). // remove file that triggers pre-commit hook to fail
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("bad")).Select(Contains("discard all changes")).Confirm()
t.ExpectPopup().Menu().Title(Equals("bad")).Select(Contains("Discard all changes")).Confirm()
}).
Lines(
Contains("one"),

4
pkg/integration/tests/filter_by_path/select_file.go
View File

@ -23,7 +23,7 @@ var SelectFile = NewIntegrationTest(NewIntegrationTestArgs{
Contains(`only otherFile`),
Contains(`both files`),
).
SelectNextItem().
NavigateToLine(Contains(`only filterFile`)).
PressEnter()
// when you click into the commit itself, you see all files from that commit
@ -34,7 +34,7 @@ var SelectFile = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.FilteringMenu)
t.ExpectPopup().Menu().Title(Equals("Filtering")).Select(Contains("filter by 'filterFile'")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Filtering")).Select(Contains("Filter by 'filterFile'")).Confirm()
postFilterTest(t)
},

2
pkg/integration/tests/filter_by_path/shared.go
View File

@ -19,7 +19,7 @@ func commonSetup(shell *Shell) {
}
func postFilterTest(t *TestDriver) {
t.Views().Information().Content(Contains("filtering by 'filterFile'"))
t.Views().Information().Content(Contains("Filtering by 'filterFile'"))
t.Views().Commits().
IsFocused().

2
pkg/integration/tests/filter_by_path/type_file.go
View File

@ -21,7 +21,7 @@ var TypeFile = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().
Title(Equals("Filtering")).
Select(Contains("enter path to filter by")).
Select(Contains("Enter path to filter by")).
Confirm()
t.ExpectPopup().Prompt().

2
pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go
View File

@ -40,7 +40,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Menu().
Title(Equals(fmt.Sprintf("Rebase '%s' onto '%s'", TOP_BRANCH, BASE_BRANCH))).
Select(Contains("interactive rebase")).
Select(Contains("Interactive rebase")).
Confirm()
t.Views().Commits().
IsFocused().

2
pkg/integration/tests/interactive_rebase/amend_first_commit.go
View File

@ -26,7 +26,7 @@ var AmendFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.AmendToCommit).
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Equals("Amend Commit")).
Title(Equals("Amend commit")).
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
Confirm()
}).

2
pkg/integration/tests/interactive_rebase/amend_fixup_commit.go
View File

@ -32,7 +32,7 @@ var AmendFixupCommit = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.AmendToCommit).
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Equals("Amend Commit")).
Title(Equals("Amend commit")).
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
Confirm()
}).

2
pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go
View File

@ -43,7 +43,7 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.AmendToCommit).
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Equals("Amend Last Commit")).
Title(Equals("Amend last commit")).
Content(Contains("Are you sure you want to amend last commit?")).
Confirm()
}).

2
pkg/integration/tests/interactive_rebase/amend_merge.go
View File

@ -42,7 +42,7 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.AmendToCommit)
t.ExpectPopup().Confirmation().
Title(Equals("Amend Last Commit")).
Title(Equals("Amend last commit")).
Content(Contains("Are you sure you want to amend last commit?")).
Confirm()

4
pkg/integration/tests/patch_building/apply.go
View File

@ -46,11 +46,11 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().PatchBuildingSecondary().Content(Contains("second line"))
t.Common().SelectPatchOption(MatchesRegexp(`apply patch$`))
t.Common().SelectPatchOption(MatchesRegexp(`Apply patch$`))
t.Views().Files().
Focus().

4
pkg/integration/tests/patch_building/apply_in_reverse.go
View File

@ -31,11 +31,11 @@ var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
t.Common().SelectPatchOption(Contains("apply patch in reverse"))
t.Common().SelectPatchOption(Contains("Apply patch in reverse"))
t.Views().Files().
Focus().

4
pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
View File

@ -40,7 +40,7 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
// Add both files to the patch; the first will conflict, the second won't
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().PatchBuildingSecondary().Content(
Contains("+more file1 content"))
@ -51,7 +51,7 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().PatchBuildingSecondary().Content(
Contains("+more file1 content").Contains("+more file2 content"))
t.Common().SelectPatchOption(Contains("apply patch in reverse"))
t.Common().SelectPatchOption(Contains("Apply patch in reverse"))
t.ExpectPopup().Alert().
Title(Equals("Error")).

2
pkg/integration/tests/patch_building/copy_patch_to_clipboard.go
View File

@ -38,7 +38,7 @@ var CopyPatchToClipboard = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Common().SelectPatchOption(Contains("copy patch to clipboard"))

4
pkg/integration/tests/patch_building/move_to_earlier_commit.go
View File

@ -46,13 +46,13 @@ var MoveToEarlierCommit = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction().
PressEscape()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Commits().
IsFocused().
SelectNextItem()
t.Common().SelectPatchOption(Contains("move patch to selected commit"))
t.Common().SelectPatchOption(Contains("Move patch to selected commit"))
t.Views().Commits().
IsFocused().

4
pkg/integration/tests/patch_building/move_to_earlier_commit_no_keep_empty.go
View File

@ -46,13 +46,13 @@ var MoveToEarlierCommitNoKeepEmpty = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction().
PressEscape()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Commits().
IsFocused().
SelectNextItem()
t.Common().SelectPatchOption(Contains("move patch to selected commit"))
t.Common().SelectPatchOption(Contains("Move patch to selected commit"))
t.Views().Commits().
IsFocused().

4
pkg/integration/tests/patch_building/move_to_index.go
View File

@ -31,11 +31,11 @@ var MoveToIndex = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
t.Common().SelectPatchOption(Contains("move patch out into index"))
t.Common().SelectPatchOption(Contains("Move patch out into index"))
t.Views().Files().
Lines(

4
pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go
View File

@ -43,9 +43,9 @@ var MoveToIndexPartOfAdjacentAddedLines = NewIntegrationTest(NewIntegrationTestA
PressEnter().
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Common().SelectPatchOption(Contains("move patch out into index"))
t.Common().SelectPatchOption(Contains("Move patch out into index"))
t.Views().CommitFiles().
IsFocused().

4
pkg/integration/tests/patch_building/move_to_index_partial.go
View File

@ -51,7 +51,7 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{
SelectNextItem().
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().PatchBuildingSecondary().
ContainsLines(
@ -61,7 +61,7 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{
Contains(` third line`),
)
t.Common().SelectPatchOption(Contains("move patch out into index"))
t.Common().SelectPatchOption(Contains("Move patch out into index"))
t.Views().Files().
Lines(

4
pkg/integration/tests/patch_building/move_to_index_with_conflict.go
View File

@ -38,9 +38,9 @@ var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Common().SelectPatchOption(Contains("move patch out into index"))
t.Common().SelectPatchOption(Contains("Move patch out into index"))
t.Common().AcknowledgeConflicts()

4
pkg/integration/tests/patch_building/move_to_later_commit.go
View File

@ -46,13 +46,13 @@ var MoveToLaterCommit = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction().
PressEscape()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Commits().
IsFocused().
SelectPreviousItem()
t.Common().SelectPatchOption(Contains("move patch to selected commit"))
t.Common().SelectPatchOption(Contains("Move patch to selected commit"))
t.Views().Commits().
IsFocused().

4
pkg/integration/tests/patch_building/move_to_later_commit_partial_hunk.go
View File

@ -44,7 +44,7 @@ var MoveToLaterCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction().
PressEscape()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().CommitFiles().
IsFocused().
@ -54,7 +54,7 @@ var MoveToLaterCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
SelectPreviousItem()
t.Common().SelectPatchOption(Contains("move patch to selected commit"))
t.Common().SelectPatchOption(Contains("Move patch to selected commit"))
t.Views().Commits().
IsFocused().

4
pkg/integration/tests/patch_building/move_to_new_commit.go
View File

@ -46,9 +46,9 @@ var MoveToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction().
PressEscape()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Common().SelectPatchOption(Contains("move patch into new commit"))
t.Common().SelectPatchOption(Contains("Move patch into new commit"))
t.Views().Commits().
IsFocused().

4
pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go
View File

@ -43,9 +43,9 @@ var MoveToNewCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{
PressEnter().
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Common().SelectPatchOption(Contains("move patch into new commit"))
t.Common().SelectPatchOption(Contains("Move patch into new commit"))
t.Views().CommitFiles().
IsFocused().

4
pkg/integration/tests/patch_building/remove_from_commit.go
View File

@ -31,11 +31,11 @@ var RemoveFromCommit = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().PatchBuildingSecondary().Content(Contains("+file1 content"))
t.Common().SelectPatchOption(Contains("remove patch from original commit"))
t.Common().SelectPatchOption(Contains("Remove patch from original commit"))
t.Views().Files().IsEmpty()

4
pkg/integration/tests/patch_building/reset_with_escape.go
View File

@ -29,7 +29,7 @@ var ResetWithEscape = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
}).
PressEscape()
@ -38,6 +38,6 @@ var ResetWithEscape = NewIntegrationTest(NewIntegrationTestArgs{
IsFocused().
PressEscape()
t.Views().Information().Content(DoesNotContain("building patch"))
t.Views().Information().Content(DoesNotContain("Building patch"))
},
})

2
pkg/integration/tests/patch_building/select_all_files.go
View File

@ -33,7 +33,7 @@ var SelectAllFiles = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Files.ToggleStagedAll)
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Secondary().Content(
Contains("file1").Contains("file3").Contains("file3"),

6
pkg/integration/tests/patch_building/specific_selection.go
View File

@ -39,7 +39,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Secondary().Content(Contains("direct file content"))
}).
@ -78,7 +78,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
Contains(` 1f`),
).
Tap(func() {
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Secondary().Content(
// when we're inside the patch building panel, we only show the patch
@ -113,7 +113,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{
NavigateToLine(Contains("+2g")).
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Secondary().ContainsLines(
Contains("+2a"),

4
pkg/integration/tests/patch_building/start_new_patch.go
View File

@ -33,7 +33,7 @@ var StartNewPatch = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction().
Tap(func() {
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().Secondary().Content(Contains("file2"))
}).
@ -52,7 +52,7 @@ var StartNewPatch = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction().
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Contains("Discard Patch")).
Title(Contains("Discard patch")).
Content(Contains("You can only build a patch from one commit/stash-entry at a time. Discard current patch?")).
Confirm()

2
pkg/integration/tests/reflog/checkout.go
View File

@ -29,7 +29,7 @@ var Checkout = NewIntegrationTest(NewIntegrationTestArgs{
PressPrimaryAction().
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Contains("checkout commit")).
Title(Contains("Checkout commit")).
Content(Contains("Are you sure you want to checkout this commit?")).
Confirm()
}).

2
pkg/integration/tests/reflog/cherry_pick.go
View File

@ -38,7 +38,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.PasteCommits).
Tap(func() {
t.ExpectPopup().Alert().
Title(Equals("Cherry-Pick")).
Title(Equals("Cherry-pick")).
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
Confirm()
}).

6
pkg/integration/tests/reflog/patch.go
View File

@ -47,15 +47,15 @@ var Patch = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().
CommitFiles().
Press(keys.Universal.CreatePatchOptionsMenu)
t.ExpectPopup().Menu().
Title(Equals("Patch Options")).
Select(MatchesRegexp(`apply patch$`)).Confirm()
Title(Equals("Patch options")).
Select(MatchesRegexp(`Apply patch$`)).Confirm()
t.Views().Files().Lines(
Contains("file1"),

4
pkg/integration/tests/reflog/reset.go
View File

@ -29,8 +29,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.ViewResetOptions).
Tap(func() {
t.ExpectPopup().Menu().
Title(Contains("reset to")).
Select(Contains("hard reset")).
Title(Contains("Reset to")).
Select(Contains("Hard reset")).
Confirm()
}).
TopLines(

6
pkg/integration/tests/stash/apply_patch.go
View File

@ -35,15 +35,15 @@ var ApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Views().Information().Content(Contains("building patch"))
t.Views().Information().Content(Contains("Building patch"))
t.Views().
CommitFiles().
Press(keys.Universal.CreatePatchOptionsMenu)
t.ExpectPopup().Menu().
Title(Equals("Patch Options")).
Select(MatchesRegexp(`apply patch$`)).Confirm()
Title(Equals("Patch options")).
Select(MatchesRegexp(`Apply patch$`)).Confirm()
})
t.Views().Files().Lines(

2
pkg/integration/tests/stash/create_branch.go
View File

@ -27,7 +27,7 @@ var CreateBranch = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.New).
Tap(func() {
t.ExpectPopup().Prompt().
Title(Contains("New Branch Name (Branch is off of 'stash@{0}: On master: stash one'")).
Title(Contains("New branch name (branch is off of 'stash@{0}: On master: stash one'")).
Type("new_branch").
Confirm()
})

2
pkg/integration/tests/stash/stash_all.go
View File

@ -25,7 +25,7 @@ var StashAll = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Files.ViewStashOptions)
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("Stash all changes$")).Confirm()
t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()

2
pkg/integration/tests/stash/stash_and_keep_index.go
View File

@ -28,7 +28,7 @@ var StashAndKeepIndex = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Files.ViewStashOptions)
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("stash all changes and keep index")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("Stash all changes and keep index")).Confirm()
t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()

2
pkg/integration/tests/stash/stash_including_untracked_files.go
View File

@ -27,7 +27,7 @@ var StashIncludingUntrackedFiles = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Files.ViewStashOptions)
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("stash all changes including untracked files")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("Stash all changes including untracked files")).Confirm()
t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()

2
pkg/integration/tests/stash/stash_staged.go
View File

@ -28,7 +28,7 @@ var StashStaged = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Files.ViewStashOptions)
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash staged changes$")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("Stash staged changes$")).Confirm()
t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()

2
pkg/integration/tests/stash/stash_unstaged.go
View File

@ -28,7 +28,7 @@ var StashUnstaged = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Files.ViewStashOptions)
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash unstaged changes$")).Confirm()
t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("Stash unstaged changes$")).Confirm()
t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()

6
pkg/integration/tests/submodule/add.go
View File

@ -19,16 +19,16 @@ var Add = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.New).
Tap(func() {
t.ExpectPopup().Prompt().
Title(Equals("new submodule URL:")).
Title(Equals("New submodule URL:")).
Type("../other_repo").Confirm()
t.ExpectPopup().Prompt().
Title(Equals("new submodule name:")).
Title(Equals("New submodule name:")).
InitialText(Equals("other_repo")).
Clear().Type("my_submodule").Confirm()
t.ExpectPopup().Prompt().
Title(Equals("new submodule path:")).
Title(Equals("New submodule path:")).
InitialText(Equals("my_submodule")).
Clear().Type("my_submodule_path").Confirm()
}).

2
pkg/integration/tests/submodule/reset.go
View File

@ -71,7 +71,7 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Menu().Title(Equals("my_submodule")).Select(Contains("stash uncommitted submodule changes and update")).Confirm()
t.ExpectPopup().Menu().Title(Equals("my_submodule")).Select(Contains("Stash uncommitted submodule changes and update")).Confirm()
}).
IsEmpty()

2
pkg/integration/tests/sync/push_tag.go
View File

@ -28,7 +28,7 @@ var PushTag = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.PushTag)
t.ExpectPopup().Prompt().
Title(Equals("remote to push tag 'mytag' to:")).
Title(Equals("Remote to push tag 'mytag' to:")).
InitialText(Equals("origin")).
SuggestionLines(
Contains("origin"),

2
pkg/integration/tests/sync/rename_branch_and_pull.go
View File

@ -34,7 +34,7 @@ var RenameBranchAndPull = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Branches.RenameBranch).
Tap(func() {
t.ExpectPopup().Confirmation().
Title(Equals("rename branch")).
Title(Equals("Rename branch")).
Content(Equals("This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?")).
Confirm()

2
pkg/integration/tests/tag/crud_annotated.go
View File

@ -21,7 +21,7 @@ var CrudAnnotated = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Create tag")).
Select(Contains("annotated")).
Select(Contains("Annotated")).
Confirm()
t.ExpectPopup().Prompt().

2
pkg/integration/tests/tag/crud_lightweight.go
View File

@ -21,7 +21,7 @@ var CrudLightweight = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Create tag")).
Select(Contains("lightweight")).
Select(Contains("Lightweight")).
Confirm()
t.ExpectPopup().Prompt().

4
pkg/integration/tests/tag/reset.go
View File

@ -29,8 +29,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.ViewResetOptions)
t.ExpectPopup().Menu().
Title(Contains("reset to tag")).
Select(Contains("hard reset")).
Title(Contains("Reset to tag")).
Select(Contains("Hard reset")).
Confirm()
t.Views().Commits().Lines(

2
pkg/integration/tests/ui/double_popup.go
View File

@ -25,7 +25,7 @@ var DoublePopup = NewIntegrationTest(NewIntegrationTestArgs{
t.GlobalPress(keys.Universal.OpenRecentRepos)
t.ExpectPopup().Menu().Title(Contains("recent repositories")).Cancel()
t.ExpectPopup().Menu().Title(Contains("Recent repositories")).Cancel()
t.Views().Branches().IsFocused()

4
pkg/integration/tests/ui/switch_tab_from_menu.go
View File

@ -16,8 +16,8 @@ var SwitchTabFromMenu = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Files().IsFocused().
Press(keys.Universal.OptionMenuAlt1)
t.ExpectPopup().Menu().Title(Equals("Menu")).
Select(Contains("next tab")).
t.ExpectPopup().Menu().Title(Equals("Keybindings")).
Select(Contains("Next tab")).
Confirm()
t.Views().Submodules().IsFocused()

2
pkg/integration/tests/undo/undo_checkout_and_drop.go
View File

@ -24,7 +24,7 @@ var UndoCheckoutAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
confirmCommitDrop := func() {
t.ExpectPopup().Confirmation().
Title(Equals("Delete Commit")).
Title(Equals("Delete commit")).
Content(Equals("Are you sure you want to delete this commit?")).
Confirm()
}

2
pkg/integration/tests/undo/undo_drop.go
View File

@ -19,7 +19,7 @@ var UndoDrop = NewIntegrationTest(NewIntegrationTestArgs{
Run: func(t *TestDriver, keys config.KeybindingConfig) {
confirmCommitDrop := func() {
t.ExpectPopup().Confirmation().
Title(Equals("Delete Commit")).
Title(Equals("Delete commit")).
Content(Equals("Are you sure you want to delete this commit?")).
Confirm()
}