Update goldens to match them on GH actions

This commit is contained in:
David Dworken 2023-12-22 08:48:26 -08:00
parent 74f2a4a136
commit cc5f8b5835
No known key found for this signature in database
7 changed files with 21 additions and 21 deletions

View File

@ -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, "Exit Code", "hishtory is showing a table even after control-c?")
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)
}
}
// Disable control-r
_, _ = 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, "Exit Code", "hishtory overrode control-r even when this was disabled?")
if testutils.IsGithubAction() {
// This bit is broken on actions since actions run as a different user
testutils.CompareGoldens(t, out, "testControlR-"+shellName+"-Disabled")
}

View File

@ -1,3 +1,3 @@
david@ghaction-runner-hostname hishtory % hishtory tquery
ghaction-runner-hostname% hishtory tquery
david@ghaction-runner-hostname hishtory %
ghaction-runner-hostname%

View File

@ -1,2 +1,2 @@
bash-5.2$ source /Users/david/.bashrc
bash-5.2$ echo
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ source /home/runner/.bashrc
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo

View File

@ -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'

View File

@ -1 +1 @@
david@Davids-MacBook-Air hishtory % echo
ghaction-runner-hostname% echo

View File

@ -1,8 +1,8 @@
bash-5.2$ source /Users/david/.bashrc
bash-5.2$ echo foo
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ source /home/runner/.bashrc
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo foo
foo
bash-5.2$ hishtory
bash: hishtory: command not found
bash-5.2$ echo bar
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ hishtory
hishtory: command not found
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$ echo bar
bar
bash-5.2$
runner@ghaction-runner-hostname:~/work/hishtory/hishtory$

View File

@ -1,7 +1,7 @@
david@Davids-MacBook-Air hishtory % echo foo
ghaction-runner-hostname% echo foo
foo
david@Davids-MacBook-Air hishtory % hishtory
ghaction-runner-hostname% hishtory
zsh: command not found: hishtory
david@Davids-MacBook-Air hishtory % echo bar
ghaction-runner-hostname% echo bar
bar
david@Davids-MacBook-Air hishtory %
ghaction-runner-hostname%