Adding AddCoAuthorTooltip to i18n

- Adding AddCoAuthorTooltip to english lang.
- Solved nits in jesseduffield#2912 PR.
- Changed add_co_author test to suggested.

Author: omaussa

pkg/commands/git_commands/commit.go

@@ -47,10 +47,8 @@ func (self *CommitCommands) AddCoAuthor(sha string, value string) error {
 
 	message = message + fmt.Sprintf("\nCo-authored-by: %s", value)
 
-	args := []string{"-m", message}
 	cmdArgs := NewGitCmd("commit").
-		Arg("--allow-empty", "--amend", "--only").
-		Arg(args...).
+		Arg("--allow-empty", "--amend", "--only", "-m", message).
 		ToArgv()
 
 	return self.cmd.New(cmdArgs).Run()

pkg/gui/controllers/local_commits_controller.go

@@ -579,7 +579,7 @@ func (self *LocalCommitsController) amendAttribute(commit *models.Commit) error
 				Label:   self.c.Tr.AddCoAuthor,
 				OnPress: self.addCoAuthor,
 				Key:     'c',
-				Tooltip: "Add co-author using the Github/Gitlab metadata Co-authored-by",
+				Tooltip: self.c.Tr.AddCoAuthorTooltip,
 			},
 		},
 	})

pkg/i18n/english.go

@@ -104,6 +104,7 @@ type TranslationSet struct {
 	SetResetCommitAuthor                string
 	SetAuthorPromptTitle                string
 	AddCoAuthorPromptTitle              string
+	AddCoAuthorTooltip                  string
 	SureResetCommitAuthor               string
 	RenameCommitEditor                  string
 	NoCommitsThisBranch                 string
@@ -869,6 +870,7 @@ func EnglishTranslationSet() TranslationSet {
 		SetResetCommitAuthor:                "Set/Reset commit author",
 		SetAuthorPromptTitle:                "Set author (must look like 'Name <Email>')",
 		AddCoAuthorPromptTitle:              "Add co-author (must look like 'Name <Email>')",
+		AddCoAuthorTooltip:                  "Add co-author using the Github/Gitlab metadata Co-authored-by",
 		SureResetCommitAuthor:               "The author field of this commit will be updated to match the configured user. This also renews the author timestamp. Continue?",
 		RenameCommitEditor:                  "Reword commit with editor",
 		Error:                               "Error",

pkg/integration/tests/commit/add_co_author.go

@@ -11,48 +11,14 @@ var AddCoAuthor = NewIntegrationTest(NewIntegrationTestArgs{
 	Skip:         false,
 	SetupConfig:  func(config *config.AppConfig) {},
 	SetupRepo: func(shell *Shell) {
-		shell.NewBranch("original")
-
-		shell.SetConfig("user.email", "[email protected]")
-		shell.SetConfig("user.name", "Bill Smith")
-
-		shell.EmptyCommit("one")
-
-		shell.NewBranch("other")
-
-		shell.SetConfig("user.email", "[email protected]")
-		shell.SetConfig("user.name", "John Smith")
-
-		shell.EmptyCommit("two")
-
-		shell.Checkout("original")
+		shell.EmptyCommit("initial commit")
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		t.Views().Commits().
 			Focus().
 			Lines(
-				Contains("BS").Contains("one").IsSelected(),
-			)
-
-		t.Views().Branches().
-			Focus().
-			Lines(
-				Contains("original").IsSelected(),
-				Contains("other"),
+				Contains("initial commit").IsSelected(),
 			).
-			NavigateToLine(Contains("other")).
-			PressEnter()
-
-		// ensuring we get these commit authors as suggestions
-		t.Views().SubCommits().
-			IsFocused().
-			Lines(
-				Contains("JS").Contains("two").IsSelected(),
-				Contains("BS").Contains("one"),
-			)
-
-		t.Views().Commits().
-			Focus().
 			Press(keys.Commits.ResetCommitAuthor).
 			Tap(func() {
 				t.ExpectPopup().Menu().
@@ -62,14 +28,13 @@ var AddCoAuthor = NewIntegrationTest(NewIntegrationTestArgs{
 
 				t.ExpectPopup().Prompt().
 					Title(Contains("Add co-author")).
-					SuggestionLines(
-						Contains("Bill Smith"),
-						Contains("John Smith"),
-					).
-					ConfirmSuggestion(Contains("John Smith"))
+					Type("John Smith <[email protected]>").
+					Confirm()
 			})
+
 		t.Views().Main().ContainsLines(
-			Contains("Co-authored-by"),
+			Contains("initial commit"),
+			Contains("Co-authored-by: John Smith <[email protected]>"),
 		)
 	},
 })