summaryrefslogtreecommitdiffstats
path: root/pkg/integration
diff options
context:
space:
mode:
authorStefan Haller <stefan@haller-berlin.de>2023-04-17 17:32:10 +0200
committerStefan Haller <stefan@haller-berlin.de>2023-06-26 08:15:35 +0200
commit51a558040d64c54e66609a708307008dae3ce7ec (patch)
tree50227c49e9ff0a536592ccb3741ca5d4a0dc4329 /pkg/integration
parent6ecd6912234633ee71cffbdc7770c26fa6810dd1 (diff)
Fix the title and text (and variable names) of the Discard Changes prompt
The title was saying "Unstage lines", which was just wrong. The text said "Delete lines", which can be seen as a bit misleading; we are only discarding the changes to the selected lines, not deleting the lines themselves. For consistency, rename the config variable skipUnstageLineWarning accordingly.
Diffstat (limited to 'pkg/integration')
-rw-r--r--pkg/integration/components/common.go4
-rw-r--r--pkg/integration/tests/staging/stage_lines.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/integration/components/common.go b/pkg/integration/components/common.go
index 904c73711..12afaee2f 100644
--- a/pkg/integration/components/common.go
+++ b/pkg/integration/components/common.go
@@ -34,8 +34,8 @@ func (self *Common) ContinueOnConflictsResolved() {
func (self *Common) ConfirmDiscardLines() {
self.t.ExpectPopup().Confirmation().
- Title(Equals("Unstage lines")).
- Content(Contains("Are you sure you want to delete the selected lines")).
+ Title(Equals("Discard change")).
+ Content(Contains("Are you sure you want to discard this change")).
Confirm()
}
diff --git a/pkg/integration/tests/staging/stage_lines.go b/pkg/integration/tests/staging/stage_lines.go
index 197e003ca..5df7b23d4 100644
--- a/pkg/integration/tests/staging/stage_lines.go
+++ b/pkg/integration/tests/staging/stage_lines.go
@@ -92,8 +92,8 @@ var StageLines = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Universal.Remove).
Tap(func() {
t.ExpectPopup().Confirmation().
- Title(Equals("Unstage lines")).
- Content(Contains("Are you sure you want to delete the selected lines")).
+ Title(Equals("Discard change")).
+ Content(Contains("Are you sure you want to discard this change")).
Confirm()
}).
IsEmpty()