diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-04-20 13:49:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-20 13:49:43 +0200 |
| commit | 580818e935e19a67f7fe1bbb148224a95781879c (patch) | |
| tree | 3d6a7067c79dd51435329a6aaebcb38538fd0826 | |
| parent | 34f8f7293c5c901461a26f09839ebe5f0dd79869 (diff) | |
| parent | 1c098ff82a07728a98abee3fd388e0b3c52fc6e8 (diff) | |
| -rw-r--r-- | pkg/integration/components/test_driver.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/custom_commands/form_prompts.go | 2 | ||||
| -rw-r--r-- | pkg/integration/tests/worktree/fast_forward_worktree_branch.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg/integration/components/test_driver.go b/pkg/integration/components/test_driver.go index d266dfb73..a1775239c 100644 --- a/pkg/integration/components/test_driver.go +++ b/pkg/integration/components/test_driver.go @@ -121,7 +121,7 @@ func (self *TestDriver) ExpectClipboard(matcher *TextMatcher) { self.assertWithRetries(func() (bool, string) { text, err := clipboard.ReadAll() if err != nil { - return false, "Error occured when reading from clipboard: " + err.Error() + return false, "Error occurred when reading from clipboard: " + err.Error() } ok, _ := matcher.test(text) return ok, fmt.Sprintf("Expected clipboard to match %s, but got %s", matcher.name(), text) diff --git a/pkg/integration/tests/custom_commands/form_prompts.go b/pkg/integration/tests/custom_commands/form_prompts.go index 8ab54451d..a64c1aa4c 100644 --- a/pkg/integration/tests/custom_commands/form_prompts.go +++ b/pkg/integration/tests/custom_commands/form_prompts.go @@ -6,7 +6,7 @@ import ( ) var FormPrompts = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Using a custom command reffering prompt responses by name", + Description: "Using a custom command referring prompt responses by name", ExtraCmdArgs: []string{}, Skip: false, SetupRepo: func(shell *Shell) { diff --git a/pkg/integration/tests/worktree/fast_forward_worktree_branch.go b/pkg/integration/tests/worktree/fast_forward_worktree_branch.go index 99d32f40a..6c382a867 100644 --- a/pkg/integration/tests/worktree/fast_forward_worktree_branch.go +++ b/pkg/integration/tests/worktree/fast_forward_worktree_branch.go @@ -11,7 +11,7 @@ var FastForwardWorktreeBranch = NewIntegrationTest(NewIntegrationTestArgs{ Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { - // both main and linked worktree will have changed to fast-foward + // both main and linked worktree will have changed to fast-forward shell.NewBranch("mybranch") shell.CreateFileAndAdd("README.md", "hello world") shell.Commit("initial commit") |