summaryrefslogtreecommitdiffstats
path: root/pkg/integration
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2023-05-25 21:11:51 +1000
committerJesse Duffield <jessedduffield@gmail.com>2023-05-25 23:52:19 +1000
commitd772c9f1d446f9566d0c46a1cb76dc63ef31cb21 (patch)
treec5d3208eb325241bb34816ee2a363bdba0adcf37 /pkg/integration
parente5534d9781d3e19fb2f2b3c86b737bddf914d405 (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')
-rw-r--r--pkg/integration/components/common.go8
-rw-r--r--pkg/integration/tests/bisect/basic.go8
-rw-r--r--pkg/integration/tests/bisect/from_other_branch.go6
-rw-r--r--pkg/integration/tests/branch/create_tag.go2
-rw-r--r--pkg/integration/tests/branch/delete.go2
-rw-r--r--pkg/integration/tests/branch/detached_head.go2
-rw-r--r--pkg/integration/tests/branch/rebase.go6
-rw-r--r--pkg/integration/tests/branch/rebase_and_drop.go6
-rw-r--r--pkg/integration/tests/branch/rebase_does_not_autosquash.go2
-rw-r--r--pkg/integration/tests/branch/reset.go4
-rw-r--r--pkg/integration/tests/branch/reset_upstream.go4
-rw-r--r--pkg/integration/tests/branch/set_upstream.go4
-rw-r--r--pkg/integration/tests/cherry_pick/cherry_pick.go2
-rw-r--r--pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go2
-rw-r--r--pkg/integration/tests/commit/amend.go2
-rw-r--r--pkg/integration/tests/commit/create_tag.go2
-rw-r--r--pkg/integration/tests/commit/new_branch.go2
-rw-r--r--pkg/integration/tests/commit/reset_author.go2
-rw-r--r--pkg/integration/tests/commit/revert_merge.go2
-rw-r--r--pkg/integration/tests/commit/set_author.go2
-rw-r--r--pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go2
-rw-r--r--pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go2
-rw-r--r--pkg/integration/tests/custom_commands/omit_from_history.go6
-rw-r--r--pkg/integration/tests/diff/diff.go10
-rw-r--r--pkg/integration/tests/diff/diff_and_apply_patch.go14
-rw-r--r--pkg/integration/tests/diff/diff_commits.go6
-rw-r--r--pkg/integration/tests/file/discard_changes.go6
-rw-r--r--pkg/integration/tests/file/discard_staged_changes.go2
-rw-r--r--pkg/integration/tests/file/gitignore.go8
-rw-r--r--pkg/integration/tests/file/remember_commit_message_after_fail.go2
-rw-r--r--pkg/integration/tests/filter_by_path/select_file.go4
-rw-r--r--pkg/integration/tests/filter_by_path/shared.go2
-rw-r--r--pkg/integration/tests/filter_by_path/type_file.go2
-rw-r--r--pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go2
-rw-r--r--pkg/integration/tests/interactive_rebase/amend_first_commit.go2
-rw-r--r--pkg/integration/tests/interactive_rebase/amend_fixup_commit.go2
-rw-r--r--pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go2
-rw-r--r--pkg/integration/tests/interactive_rebase/amend_merge.go2
-rw-r--r--pkg/integration/tests/patch_building/apply.go4
-rw-r--r--pkg/integration/tests/patch_building/apply_in_reverse.go4
-rw-r--r--pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go4
-rw-r--r--pkg/integration/tests/patch_building/copy_patch_to_clipboard.go2
-rw-r--r--pkg/integration/tests/patch_building/move_to_earlier_commit.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_earlier_commit_no_keep_empty.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_index.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_index_partial.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_index_with_conflict.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_later_commit.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_later_commit_partial_hunk.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_new_commit.go4
-rw-r--r--pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go4
-rw-r--r--pkg/integration/tests/patch_building/remove_from_commit.go4
-rw-r--r--pkg/integration/tests/patch_building/reset_with_escape.go4
-rw-r--r--pkg/integration/tests/patch_building/select_all_files.go2
-rw-r--r--pkg/integration/tests/patch_building/specific_selection.go6
-rw-r--r--pkg/integration/tests/patch_building/start_new_patch.go4
-rw-r--r--pkg/integration/tests/reflog/checkout.go2
-rw-r--r--pkg/integration/tests/reflog/cherry_pick.go2
-rw-r--r--pkg/integration/tests/reflog/patch.go6
-rw-r--r--pkg/integration/tests/reflog/reset.go4
-rw-r--r--pkg/integration/tests/stash/apply_patch.go6
-rw-r--r--pkg/integration/tests/stash/create_branch.go2
-rw-r--r--pkg/integration/tests/stash/stash_all.go2
-rw-r--r--pkg/integration/tests/stash/stash_and_keep_index.go2
-rw-r--r--pkg/integration/tests/stash/stash_including_untracked_files.go2
-rw-r--r--pkg/integration/tests/stash/stash_staged.go2
-rw-r--r--pkg/integration/tests/stash/stash_unstaged.go2
-rw-r--r--pkg/integration/tests/submodule/add.go6
-rw-r--r--pkg/integration/tests/submodule/reset.go2
-rw-r--r--pkg/integration/tests/sync/push_tag.go2
-rw-r--r--pkg/integration/tests/sync/rename_branch_and_pull.go2
-rw-r--r--pkg/integration/tests/tag/crud_annotated.go2
-rw-r--r--pkg/integration/tests/tag/crud_lightweight.go2
-rw-r--r--pkg/integration/tests/tag/reset.go4
-rw-r--r--pkg/integration/tests/ui/double_popup.go2
-rw-r--r--pkg/integration/tests/ui/switch_tab_from_menu.go4
-rw-r--r--pkg/integration/tests/undo/undo_checkout_and_drop.go2
-rw-r--r--pkg/integration/tests/undo/undo_drop.go2
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