extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-19 19:37:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for disabling control-r

Browse Source
This commit is contained in:
David Dworken 2022-10-23 00:53:47 -07:00
parent ac808777d6
commit 4060f2d71d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/client_test.go
View File

@ -1752,8 +1752,6 @@ func captureTerminalOutputWithShellName(t *testing.T, tester shellTester, overri
return strings.TrimSpace(tester.RunInteractiveShell(t, fullCommand)) return strings.TrimSpace(tester.RunInteractiveShell(t, fullCommand))
} }
// TODO: check that if enable-control-r is false, then it isn't enabled
func testControlR(t *testing.T, tester shellTester, shellName string) { func testControlR(t *testing.T, tester shellTester, shellName string) {
// Setup // Setup
defer shared.BackupAndRestore(t)() defer shared.BackupAndRestore(t)()
@ -1778,10 +1776,6 @@ func testControlR(t *testing.T, tester shellTester, shellName string) {
// And check that the control-r binding brings up the search // And check that the control-r binding brings up the search
out := captureTerminalOutputWithShellName(t, tester, shellName, []string{"C-R"}) out := captureTerminalOutputWithShellName(t, tester, shellName, []string{"C-R"})
if !strings.Contains(out, "\n\n\n") { if !strings.Contains(out, "\n\n\n") {
if shellName == "zsh" {
// TODO: delete this debugging code
t.Fatalf("failed to find separator in %#v, compaudit=%#v", out, tester.RunInteractiveShell(t, "compaudit"))
}
t.Fatalf("failed to find separator in %#v", out) t.Fatalf("failed to find separator in %#v", out)
} }
stripped := strings.TrimSpace(strings.Split(out, "\n\n\n")[1]) stripped := strings.TrimSpace(strings.Split(out, "\n\n\n")[1])
@ -1883,6 +1877,14 @@ func testControlR(t *testing.T, tester shellTester, shellName string) {
if diff := cmp.Diff(expected, stripped); diff != "" { if diff := cmp.Diff(expected, stripped); diff != "" {
t.Fatalf("hishtory tquery mismatch (-expected +got):\n%s \n(out=%#v)", diff, out) t.Fatalf("hishtory tquery mismatch (-expected +got):\n%s \n(out=%#v)", diff, out)
} }
// Disable control-r
_, _ = tester.RunInteractiveShellRelaxed(t, `hishtory config-set enable-control-r false`)
// And it shouldn't pop up
out = captureTerminalOutputWithShellName(t, tester, shellName, []string{"C-R"})
if strings.Contains(out, "Search Query") || strings.Contains(out, "─────") || strings.Contains(out, "Exit Code") {
t.Fatalf("hishtory overrode control-r even when this was disabled? out=%#v", out)
}
} }
type deviceSet struct { type deviceSet struct {