Merge pull request #8 from timvw/feat/macos-e2e-tests

feat: add macOS e2e tests for bash and zsh

Author: timvw

.github/workflows/ci.yml

@@ -147,3 +147,203 @@ jobs:
         run: |
           ls -lh bin/
           file bin/*
+
+  e2e-macos:
+    name: E2E Tests (macOS)
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        shell: ['bash', 'zsh']
+
+    steps:
+      - name: Generate GitHub App token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.BOT_APP_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Download dependencies
+        run: go mod download
+
+      - name: Build wt binary
+        run: |
+          mkdir -p bin
+          go build -o bin/wt .
+
+      - name: Verify binary
+        run: |
+          ./bin/wt --help
+          file bin/wt
+
+      - name: Run e2e tests for ${{ matrix.shell }}
+        run: |
+          # Set up isolated test environment
+          export ISOLATED_TMPDIR=$(mktemp -d)
+          export HOME=$ISOLATED_TMPDIR
+
+          # Run specific e2e tests (not ./... to avoid redundancy)
+          if [ "${{ matrix.shell }}" = "bash" ]; then
+            go test -v -run 'TestE2EAutoCdWithNonInteractiveCommand|TestE2EAutoCdWithCreate' .
+          elif [ "${{ matrix.shell }}" = "zsh" ]; then
+            go test -v -run TestE2EAutoCdInZsh .
+          fi
+
+          # Cleanup (best effort - ignore errors from Go cache files)
+          rm -rf "$ISOLATED_TMPDIR" 2>/dev/null || true
+
+      - name: Test shellenv output
+        run: |
+          # Capture shellenv output for inspection
+          ./bin/wt shellenv > shellenv-${{ matrix.shell }}.txt
+
+          # Verify shellenv produces output
+          if [ ! -s shellenv-${{ matrix.shell }}.txt ]; then
+            echo "ERROR: shellenv produced no output"
+            exit 1
+          fi
+
+          # Check for key components (wt function)
+          if ! grep -q "wt()" shellenv-${{ matrix.shell }}.txt; then
+            echo "ERROR: wt function not found in shellenv output"
+            exit 1
+          fi
+
+          # Verify shell-specific features
+          if [ "${{ matrix.shell }}" = "bash" ]; then
+            grep -q "BASH_VERSION" shellenv-${{ matrix.shell }}.txt || (echo "ERROR: bash-specific code not found" && exit 1)
+          elif [ "${{ matrix.shell }}" = "zsh" ]; then
+            grep -q "ZSH_VERSION" shellenv-${{ matrix.shell }}.txt || (echo "ERROR: zsh-specific code not found" && exit 1)
+          fi
+
+          echo "shellenv validation passed for ${{ matrix.shell }}"
+
+      - name: Test worktree CRUD operations with auto-cd
+        run: |
+          # Save absolute paths BEFORE changing directories
+          WORK_DIR=$(pwd)
+          WT_BIN="$WORK_DIR/bin/wt"
+          WT_BIN_DIR="$WORK_DIR/bin"
+
+          # Create isolated test environment with separate HOME
+          ISOLATED_HOME=$(mktemp -d)
+          WORKTREE_ROOT=$(mktemp -d)/worktrees
+          TEST_REPO=$(mktemp -d)/test-repo
+
+          # Generate shellenv script
+          $WT_BIN shellenv > /tmp/wt-shellenv-${{ matrix.shell }}.sh
+
+          # Create test git repo
+          mkdir -p $TEST_REPO
+          cd $TEST_REPO
+          export HOME=$ISOLATED_HOME
+          git init
+          git config user.email "[email protected]"
+          git config user.name "Test User"
+          git commit --allow-empty -m "initial commit"
+          git branch -M main
+
+          # Create a test branch
+          git checkout -b test-branch
+          git commit --allow-empty -m "test commit"
+          git checkout main
+
+          # Determine shell command
+          if [ "${{ matrix.shell }}" = "bash" ]; then
+            SHELL_CMD="bash"
+          else
+            SHELL_CMD="zsh"
+          fi
+
+          # Save the current PATH so git is available in the subshell
+          CURRENT_PATH="$PATH"
+
+          # Run test in a subshell with shellenv sourced
+          $SHELL_CMD -c "
+            export HOME='$ISOLATED_HOME'
+            export WORKTREE_ROOT='$WORKTREE_ROOT'
+            export PATH='$WT_BIN_DIR:$CURRENT_PATH'
+            cd '$TEST_REPO'
+
+            source /tmp/wt-shellenv-${{ matrix.shell }}.sh
+
+            echo 'Testing: wt checkout test-branch'
+            wt checkout test-branch
+
+            # Verify we're in the worktree directory
+            CURRENT_DIR=\$(pwd)
+            EXPECTED_DIR='$WORKTREE_ROOT/test-repo/test-branch'
+            if [[ \"\$CURRENT_DIR\" != \"\$EXPECTED_DIR\" ]]; then
+              echo \"ERROR: Auto-cd failed. Expected: \$EXPECTED_DIR, Got: \$CURRENT_DIR\"
+              exit 1
+            fi
+            echo \"✓ Auto-cd to worktree verified: \$CURRENT_DIR\"
+
+            # Verify worktree was created
+            wt list | grep test-branch || (echo 'ERROR: worktree not in list' && exit 1)
+            echo '✓ Worktree created and listed'
+
+            # Go back to original repo to test create
+            cd '$TEST_REPO'
+
+            # Test create command (from main repo)
+            echo 'Testing: wt create feature-test'
+            wt create feature-test
+            CURRENT_DIR=\$(pwd)
+            EXPECTED_DIR='$WORKTREE_ROOT/test-repo/feature-test'
+            if [[ \"\$CURRENT_DIR\" != \"\$EXPECTED_DIR\" ]]; then
+              echo \"ERROR: Auto-cd failed for create. Expected: \$EXPECTED_DIR, Got: \$CURRENT_DIR\"
+              exit 1
+            fi
+            echo \"✓ Auto-cd to new worktree verified: \$CURRENT_DIR\"
+
+            # Go back to original repo to test remove
+            cd '$TEST_REPO'
+
+            # Test remove command
+            echo 'Testing: wt remove test-branch'
+            wt remove test-branch
+
+            # Verify worktree was removed
+            if wt list | grep test-branch; then
+              echo 'ERROR: worktree not removed'
+              exit 1
+            fi
+            echo '✓ Worktree removed successfully'
+
+            echo 'CRUD operations with auto-cd test passed!'
+          "
+
+          # Cleanup all temporary directories (best effort)
+          cd "$WORK_DIR"
+          rm -rf "$ISOLATED_HOME" "$WORKTREE_ROOT" "$TEST_REPO" /tmp/wt-shellenv-${{ matrix.shell }}.sh 2>/dev/null || true
+
+      - name: Upload shellenv output as artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: shellenv-output-${{ matrix.shell }}
+          path: shellenv-${{ matrix.shell }}.txt
+          retention-days: 7
+          if-no-files-found: ignore
+
+      - name: Upload test logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: e2e-logs-${{ matrix.shell }}
+          path: |
+            /tmp/*.log
+            /var/tmp/*.log
+          retention-days: 7
+          if-no-files-found: ignore