fix: update test scripts to run all tests and handle remote branch conflicts

.github/workflows/test-scripts.yml

@@ -52,5 +52,5 @@ jobs:
 
       - name: Run bats tests
         run: |
-          bats tests/download-mozc-artifacts.bats
+          bats tests/
 

scripts/create-update-pr.sh

@@ -164,6 +164,13 @@ git commit -m "Update Mozc to version $VERSION
 
 echo "==> Pushing branch to origin"
 
+# Check if remote branch exists and delete it to avoid conflicts
+# This handles cases where a previous workflow run created the branch
+if git ls-remote --exit-code --heads origin "$BRANCH_NAME" &> /dev/null; then
+  echo "Remote branch $BRANCH_NAME already exists, deleting it"
+  git push origin --delete "$BRANCH_NAME" || true
+fi
+
 # Push the new branch to remote repository
 git push -u origin "$BRANCH_NAME"
 

tests/README.md

@@ -61,12 +61,13 @@ bats tests/
 
 Run a specific test file:
 ```bash
-bats tests/download-mozc-artifacts.bats
+bats tests/download-mozc-artifacts.bats  # Run specific test file
+bats tests/create-update-pr.bats          # Run specific test file
 ```
 
 Run tests with verbose output:
 ```bash
-bats -t tests/download-mozc-artifacts.bats
+bats -t tests/  # Run all tests with verbose output
 ```
 
 ## Test Coverage
@@ -84,6 +85,22 @@ Tests for the `scripts/download-mozc-artifacts.sh` script:
 - **Version extraction**: Validates version string extraction with parameter expansion
 - **Artifact validation**: Tests basic pkg file validation logic
 
+### create-update-pr.bats
+
+Tests for the `scripts/create-update-pr.sh` script:
+
+- **Branch name generation**: Validates correct branch naming from version numbers
+- **Git configuration**: Tests bot identity setup for automated commits
+- **Branch creation**: Verifies new branch creation and checkout
+- **Remote branch conflict handling**: Tests detection and deletion of existing remote branches (fixes push conflicts)
+- **SHA256 checksum calculation**: Validates checksum format and calculation
+- **Commit message format**: Tests multi-line commit message generation
+- **Version string handling**: Validates version strings with dots and numbers
+- **Artifacts staging**: Tests correct files are staged for commit
+- **PR body generation**: Validates PR description content
+- **Cleanup operations**: Tests temporary file removal and branch switching
+- **Error handling**: Tests detection of missing required files
+
 ## Writing New Tests
 
 When adding new tests:
@@ -152,5 +169,5 @@ To integrate tests into other workflows:
 
 - name: Run tests
   run: |
-    bats tests/download-mozc-artifacts.bats
+    bats tests/  # Run all test files in tests directory
 ```

tests/create-update-pr.bats

@@ -0,0 +1,323 @@
+#!/usr/bin/env bats
+
+# Tests for create-update-pr.sh
+# This test file validates the PR creation and git operations logic
+
+setup() {
+    # Create a temporary directory for test repository
+    TEST_DIR="$(mktemp -d)"
+    export TEST_DIR
+
+    # Initialize a test git repository
+    cd "$TEST_DIR"
+    git init -q
+    git config user.name "Test User"
+    git config user.email "test@example.com"
+
+    # Create initial commit on main branch
+    echo "# Test Repo" > README.md
+    git add README.md
+    git commit -q -m "Initial commit"
+    git branch -M main
+}
+
+teardown() {
+    # Clean up temporary directory
+    if [ -n "$TEST_DIR" ] && [ -d "$TEST_DIR" ]; then
+        rm -rf "$TEST_DIR"
+    fi
+}
+
+# Helper function: Simulate remote branch existence check
+check_remote_branch_exists() {
+    local branch_name="$1"
+    # Simulate git ls-remote command
+    # Returns 0 if branch exists, 1 if not
+    if [ -f "$TEST_DIR/.remote_branches/$branch_name" ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Helper function: Create a mock remote branch
+create_mock_remote_branch() {
+    local branch_name="$1"
+    mkdir -p "$TEST_DIR/.remote_branches"
+    touch "$TEST_DIR/.remote_branches/$branch_name"
+}
+
+# Helper function: Delete a mock remote branch
+delete_mock_remote_branch() {
+    local branch_name="$1"
+    rm -f "$TEST_DIR/.remote_branches/$branch_name"
+}
+
+# Test branch name generation
+@test "generates correct branch name from version" {
+    VERSION="2.32.5994"
+    BRANCH_NAME="mozc-update-${VERSION}"
+
+    [ "$BRANCH_NAME" = "mozc-update-2.32.5994" ]
+}
+
+# Test git config setup for bot identity
+@test "configures git with bot identity correctly" {
+    cd "$TEST_DIR"
+
+    git config user.name "github-actions[bot]"
+    git config user.email "github-actions[bot]@users.noreply.github.com"
+
+    [ "$(git config user.name)" = "github-actions[bot]" ]
+    [ "$(git config user.email)" = "github-actions[bot]@users.noreply.github.com" ]
+}
+
+# Test branch creation
+@test "creates new branch correctly" {
+    cd "$TEST_DIR"
+
+    BRANCH_NAME="mozc-update-2.32.5994"
+    git checkout -b "$BRANCH_NAME" 2>/dev/null
+
+    current_branch=$(git branch --show-current)
+    [ "$current_branch" = "$BRANCH_NAME" ]
+}
+
+# Test remote branch existence check logic
+@test "detects when remote branch exists" {
+    BRANCH_NAME="mozc-update-2.32.5994"
+
+    # Create mock remote branch
+    create_mock_remote_branch "$BRANCH_NAME"
+
+    # Test the check
+    if check_remote_branch_exists "$BRANCH_NAME"; then
+        result="exists"
+    else
+        result="not_exists"
+    fi
+
+    [ "$result" = "exists" ]
+}
+
+# Test remote branch existence check when branch doesn't exist
+@test "detects when remote branch does not exist" {
+    BRANCH_NAME="mozc-update-2.32.5994"
+
+    # Don't create mock remote branch
+
+    # Test the check
+    if check_remote_branch_exists "$BRANCH_NAME"; then
+        result="exists"
+    else
+        result="not_exists"
+    fi
+
+    [ "$result" = "not_exists" ]
+}
+
+# Test remote branch deletion logic
+@test "deletes remote branch when it exists" {
+    BRANCH_NAME="mozc-update-2.32.5994"
+
+    # Create mock remote branch
+    create_mock_remote_branch "$BRANCH_NAME"
+
+    # Verify it exists
+    [ -f "$TEST_DIR/.remote_branches/$BRANCH_NAME" ]
+
+    # Delete it
+    delete_mock_remote_branch "$BRANCH_NAME"
+
+    # Verify it's deleted
+    [ ! -f "$TEST_DIR/.remote_branches/$BRANCH_NAME" ]
+}
+
+# Test the complete remote branch conflict resolution logic
+@test "handles remote branch conflict by deleting existing branch" {
+    BRANCH_NAME="mozc-update-2.32.5994"
+
+    # Simulate the logic from create-update-pr.sh
+    # Step 1: Check if remote branch exists
+    create_mock_remote_branch "$BRANCH_NAME"
+
+    # Step 2: If exists, delete it
+    if check_remote_branch_exists "$BRANCH_NAME"; then
+        delete_mock_remote_branch "$BRANCH_NAME"
+        deleted=true
+    else
+        deleted=false
+    fi
+
+    # Step 3: Verify deletion occurred
+    [ "$deleted" = true ]
+    [ ! -f "$TEST_DIR/.remote_branches/$BRANCH_NAME" ]
+}
+
+# Test SHA256 checksum calculation
+@test "calculates SHA256 checksum correctly" {
+    cd "$TEST_DIR"
+
+    # Create a test file
+    echo "test content" > test.pkg
+
+    # Calculate checksum
+    checksum=$(sha256sum test.pkg | awk '{print $1}')
+
+    # Verify checksum format (64 hex characters)
+    [ ${#checksum} -eq 64 ]
+    [[ "$checksum" =~ ^[0-9a-f]{64}$ ]]
+}
+
+# Test commit message format
+@test "generates correct commit message format" {
+    VERSION="2.32.5994"
+    COMMIT_SHA="abc123def456"
+
+    expected_message="Update Mozc to version $VERSION
+
+- Updated cask formula with version $VERSION
+- ARM64 (Apple Silicon) only support
+- Source: google/mozc commit $COMMIT_SHA
+- Artifacts from google/mozc GitHub Actions build"
+
+    # Verify message contains key components
+    [[ "$expected_message" == *"Update Mozc to version 2.32.5994"* ]]
+    [[ "$expected_message" == *"ARM64 (Apple Silicon) only support"* ]]
+    [[ "$expected_message" == *"google/mozc commit abc123def456"* ]]
+}
+
+# Test version string handling with special characters
+@test "handles version strings with dots and numbers correctly" {
+    VERSION="2.32.5994"
+    BRANCH_NAME="mozc-update-${VERSION}"
+
+    # Verify branch name doesn't have invalid git characters
+    [[ "$BRANCH_NAME" =~ ^[a-zA-Z0-9._-]+$ ]]
+    [ "$BRANCH_NAME" = "mozc-update-2.32.5994" ]
+}
+
+# Test artifacts directory pattern
+@test "validates artifacts directory structure" {
+    cd "$TEST_DIR"
+
+    ARTIFACTS_DIR="artifacts"
+    mkdir -p "$ARTIFACTS_DIR"
+
+    # Create mock artifact files
+    touch "$ARTIFACTS_DIR/Mozc_arm64.pkg"
+    touch "$ARTIFACTS_DIR/checksums.txt"
+    touch "$ARTIFACTS_DIR/version.json"
+
+    # Verify files exist
+    [ -f "$ARTIFACTS_DIR/Mozc_arm64.pkg" ]
+    [ -f "$ARTIFACTS_DIR/checksums.txt" ]
+    [ -f "$ARTIFACTS_DIR/version.json" ]
+}
+
+# Test git add pattern for artifacts
+@test "stages correct files for commit" {
+    cd "$TEST_DIR"
+
+    ARTIFACTS_DIR="artifacts"
+    mkdir -p "$ARTIFACTS_DIR" Casks
+
+    # Create files
+    echo "test" > Casks/mozc.rb
+    echo "test" > "$ARTIFACTS_DIR/Mozc_arm64.pkg"
+    echo "test" > "$ARTIFACTS_DIR/checksums.txt"
+    echo "test" > "$ARTIFACTS_DIR/version.json"
+
+    # Stage files
+    git add Casks/mozc.rb "$ARTIFACTS_DIR"/*.pkg "$ARTIFACTS_DIR/checksums.txt" "$ARTIFACTS_DIR/version.json"
+
+    # Check staged files
+    staged_files=$(git diff --cached --name-only)
+
+    [[ "$staged_files" == *"Casks/mozc.rb"* ]]
+    [[ "$staged_files" == *"artifacts/Mozc_arm64.pkg"* ]]
+    [[ "$staged_files" == *"artifacts/checksums.txt"* ]]
+    [[ "$staged_files" == *"artifacts/version.json"* ]]
+}
+
+# Test cleanup of temporary PR body file
+@test "removes temporary PR body file after use" {
+    cd "$TEST_DIR"
+
+    # Create temporary file
+    echo "test content" > pr_body.md
+    [ -f pr_body.md ]
+
+    # Cleanup
+    rm -f pr_body.md
+
+    # Verify removal
+    [ ! -f pr_body.md ]
+}
+
+# Test branch checkout back to original branch
+@test "returns to original branch after operations" {
+    cd "$TEST_DIR"
+
+    # Start on main
+    git checkout main 2>/dev/null
+    [ "$(git branch --show-current)" = "main" ]
+
+    # Create and switch to new branch
+    git checkout -b "mozc-update-2.32.5994" 2>/dev/null
+    [ "$(git branch --show-current)" = "mozc-update-2.32.5994" ]
+
+    # Switch back to previous branch (should be main)
+    git checkout - &>/dev/null
+    [ "$(git branch --show-current)" = "main" ]
+}
+
+# Test error handling: missing ARM64 package
+@test "detects missing ARM64 package file" {
+    cd "$TEST_DIR"
+
+    ARTIFACTS_DIR="artifacts"
+    mkdir -p "$ARTIFACTS_DIR"
+
+    # Don't create the file
+
+    # Check if file exists
+    if [ -f "$ARTIFACTS_DIR/Mozc_arm64.pkg" ]; then
+        result="exists"
+    else
+        result="missing"
+    fi
+
+    [ "$result" = "missing" ]
+}
+
+# Test PR body content generation
+@test "generates PR body with correct information" {
+    VERSION="2.32.5994"
+    COMMIT_SHA="abc123def456"
+
+    pr_body="## Update Mozc to version $VERSION
+
+This PR updates the Mozc cask formula to version **$VERSION** from google/mozc.
+
+### Changes
+- Updated version to $VERSION
+- ARM64 (Apple Silicon) only support
+- Included build artifacts from google/mozc commit [$COMMIT_SHA](https://github.com/google/mozc/commit/$COMMIT_SHA)
+
+### Artifacts
+- \`Mozc_arm64.pkg\` (ARM64/Apple Silicon)
+
+### Source
+Built from google/mozc GitHub Actions: https://github.com/google/mozc/commit/$COMMIT_SHA
+
+---
+
+**Note:** When this PR is merged to main, a release \`v$VERSION\` will be automatically created."
+
+    # Verify PR body contains key information
+    [[ "$pr_body" == *"Update Mozc to version 2.32.5994"* ]]
+    [[ "$pr_body" == *"ARM64 (Apple Silicon) only support"* ]]
+    [[ "$pr_body" == *"https://github.com/google/mozc/commit/abc123def456"* ]]
+    [[ "$pr_body" == *"v2.32.5994"* ]]
+}