[zsh] use interactive shell for running tests

scmbreeze · Feb 23, 2024 · a5f6af9 · a5f6af9
1 parent 09873d9
commit a5f6af9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
       - name: test
         env:
           TEST_SHELLS: ${{ matrix.test_shell }}
-        run: nix-shell -p ruby $TEST_SHELLS --run ./run_tests.sh
+        run: nix-shell -p ruby $TEST_SHELLS --command ./run_tests.sh
       # - run: nix-shell -p shunit2 -i ./run_tests.sh
       # - run: nix build
       # - run: nix flake check
diff --git a/test/lib/git/status_shortcuts_test.sh b/test/lib/git/status_shortcuts_test.sh
@@ -320,14 +320,7 @@ test_git_commit_prompt() {
   export HISTFILESIZE=1000
   export HISTSIZE=1000
 
-  if [[ $shell == "zsh" ]]; then
-    export SAVEHIST=1000
-    zsh_appendhistory=$( (setopt | grep -q appendhistory) && echo "true")
-    if [ "$zsh_appendhistory" != "true" ]; then
-      setopt appendhistory
-      trap "unsetopt appendhistory" EXIT
-    fi
-  fi
+  export SAVEHIST=1000
 
   touch a b c d
   git add . >/dev/null
@@ -344,8 +337,6 @@ test_git_commit_prompt() {
 
   # Test that history was appended correctly.
   if [[ $shell == "zsh" ]]; then
-    setopt
-    cat $HISTFILE
     test_history="$(history)"
   else
     # Need to load history from $HISTFILE