mirror of
https://github.com/ddworken/hishtory.git
synced 2024-11-29 11:44:53 +01:00
Update goldens to match them on GH actions
This commit is contained in:
parent
74f2a4a136
commit
cc5f8b5835
@ -2148,9 +2148,13 @@ func testControlR(t *testing.T, tester shellTester, shellName string, onlineStat
|
|||||||
require.NotContains(t, out, "─────", "hishtory is showing a table even after control-c?")
|
require.NotContains(t, out, "─────", "hishtory is showing a table even after control-c?")
|
||||||
require.NotContains(t, out, "Exit Code", "hishtory is showing a table even after control-c?")
|
require.NotContains(t, out, "Exit Code", "hishtory is showing a table even after control-c?")
|
||||||
if testutils.IsGithubAction() {
|
if testutils.IsGithubAction() {
|
||||||
// This bit is broken on actions since actions run as a different user
|
if shellName == "fish" {
|
||||||
|
require.Contains(t, out, "Welcome to fish, the friendly interactive shell")
|
||||||
|
require.Contains(t, out, "> echo ")
|
||||||
|
} else {
|
||||||
testutils.CompareGoldens(t, out, "testControlR-ControlC-"+shellName)
|
testutils.CompareGoldens(t, out, "testControlR-ControlC-"+shellName)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Disable control-r
|
// Disable control-r
|
||||||
_, _ = tester.RunInteractiveShellRelaxed(t, `hishtory config-set enable-control-r false`)
|
_, _ = tester.RunInteractiveShellRelaxed(t, `hishtory config-set enable-control-r false`)
|
||||||
@ -2160,7 +2164,6 @@ func testControlR(t *testing.T, tester shellTester, shellName string, onlineStat
|
|||||||
require.NotContains(t, out, "─────", "hishtory overrode control-r even when this was disabled?")
|
require.NotContains(t, out, "─────", "hishtory overrode control-r even when this was disabled?")
|
||||||
require.NotContains(t, out, "Exit Code", "hishtory overrode control-r even when this was disabled?")
|
require.NotContains(t, out, "Exit Code", "hishtory overrode control-r even when this was disabled?")
|
||||||
if testutils.IsGithubAction() {
|
if testutils.IsGithubAction() {
|
||||||
// This bit is broken on actions since actions run as a different user
|
|
||||||
testutils.CompareGoldens(t, out, "testControlR-"+shellName+"-Disabled")
|
testutils.CompareGoldens(t, out, "testControlR-"+shellName+"-Disabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
4
client/testdata/TestTui-Exit
vendored
4
client/testdata/TestTui-Exit
vendored
@ -1,3 +1,3 @@
|
|||||||
david@ghaction-runner-hostname hishtory % hishtory tquery
|
ghaction-runner-hostname% hishtory tquery
|
||||||
|
|
||||||
david@ghaction-runner-hostname hishtory %
|
ghaction-runner-hostname%
|
4
client/testdata/testControlR-ControlC-bash
vendored
4
client/testdata/testControlR-ControlC-bash
vendored
@ -1,2 +1,2 @@
|
|||||||
bash-5.2$ source /Users/david/.bashrc
|
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ source /home/runner/.bashrc
|
||||||
bash-5.2$ echo
|
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo
|
3
client/testdata/testControlR-ControlC-fish
vendored
3
client/testdata/testControlR-ControlC-fish
vendored
@ -1,3 +0,0 @@
|
|||||||
Welcome to fish, the friendly interactive shell
|
|
||||||
Type help for instructions on how to use fish
|
|
||||||
david@Davids-MacBook-Air ~/c/hishtory (master)> echo 'aaaaaa bbbb'
|
|
2
client/testdata/testControlR-ControlC-zsh
vendored
2
client/testdata/testControlR-ControlC-zsh
vendored
@ -1 +1 @@
|
|||||||
david@Davids-MacBook-Air hishtory % echo
|
ghaction-runner-hostname% echo
|
@ -1,8 +1,8 @@
|
|||||||
bash-5.2$ source /Users/david/.bashrc
|
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ source /home/runner/.bashrc
|
||||||
bash-5.2$ echo foo
|
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo foo
|
||||||
foo
|
foo
|
||||||
bash-5.2$ hishtory
|
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ hishtory
|
||||||
bash: hishtory: command not found
|
hishtory: command not found
|
||||||
bash-5.2$ echo bar
|
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo bar
|
||||||
bar
|
bar
|
||||||
bash-5.2$
|
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$
|
@ -1,7 +1,7 @@
|
|||||||
david@Davids-MacBook-Air hishtory % echo foo
|
ghaction-runner-hostname% echo foo
|
||||||
foo
|
foo
|
||||||
david@Davids-MacBook-Air hishtory % hishtory
|
ghaction-runner-hostname% hishtory
|
||||||
zsh: command not found: hishtory
|
zsh: command not found: hishtory
|
||||||
david@Davids-MacBook-Air hishtory % echo bar
|
ghaction-runner-hostname% echo bar
|
||||||
bar
|
bar
|
||||||
david@Davids-MacBook-Air hishtory %
|
ghaction-runner-hostname%
|
Loading…
Reference in New Issue
Block a user