diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-25 21:11:51 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-05-25 23:52:19 +1000 |
commit | d772c9f1d446f9566d0c46a1cb76dc63ef31cb21 (patch) | |
tree | c5d3208eb325241bb34816ee2a363bdba0adcf37 /pkg/integration | |
parent | e5534d9781d3e19fb2f2b3c86b737bddf914d405 (diff) |
Use sentence case everywhere
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.
Diffstat (limited to 'pkg/integration')
79 files changed, 141 insertions, 141 deletions
diff --git a/pkg/integration/components/common.go b/pkg/integration/components/common.go index 7be48e4bd..0f2e3b871 100644 --- a/pkg/integration/components/common.go +++ b/pkg/integration/components/common.go @@ -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() } diff --git a/pkg/integration/tests/bisect/basic.go b/pkg/integration/tests/bisect/basic.go index 14e1e6b49..e17f0d50f 100644 --- a/pkg/integration/tests/bisect/basic.go +++ b/pkg/integration/tests/bisect/basic.go @@ -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")) }, }) diff --git a/pkg/integration/tests/bisect/from_other_branch.go b/pkg/integration/tests/bisect/from_other_branch.go index a7c6b8358..24e49104b 100644 --- a/pkg/integration/tests/bisect/from_other_branch.go +++ b/pkg/integration/tests/bisect/from_other_branch.go @@ -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( diff --git a/pkg/integration/tests/branch/create_tag.go b/pkg/integration/tests/branch/create_tag.go index 289d04c0a..68f91ec1b 100644 --- a/pkg/integration/tests/branch/create_tag.go +++ b/pkg/integration/tests/branch/create_tag.go @@ -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(). diff --git a/pkg/integration/tests/branch/delete.go b/pkg/integration/tests/branch/delete.go index c653e1cde..78c21f7a7 100644 --- a/pkg/integration/tests/branch/delete.go +++ b/pkg/integration/tests/branch/delete.go @@ -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() }). diff --git a/pkg/integration/tests/branch/detached_head.go b/pkg/integration/tests/branch/detached_head.go index 494d164d6..9a419540b 100644 --- a/pkg/integration/tests/branch/detached_head.go +++ b/pkg/integration/tests/branch/detached_head.go @@ -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() diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index 24462d1ea..66a235107 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -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"), diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index c27a91091..9c95e40e1 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -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"), diff --git a/pkg/integration/tests/branch/rebase_does_not_autosquash.go b/pkg/integration/tests/branch/rebase_does_not_autosquash.go index 11562c80f..66ad870c4 100644 --- a/pkg/integration/tests/branch/rebase_does_not_autosquash.go +++ b/pkg/integration/tests/branch/rebase_does_not_autosquash.go @@ -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( diff --git a/pkg/integration/tests/branch/reset.go b/pkg/integration/tests/branch/reset.go index b999f3af7..bafc712d1 100644 --- a/pkg/integration/tests/branch/reset.go +++ b/pkg/integration/tests/branch/reset.go @@ -36,8 +36,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.ViewResetOptions) t.ExpectPopup().Menu(). - Title(Contains("reset to other-branch |