Tests: separate checkout ref fixtures

Author: nodeselector

test/integration/run.rb

@@ -347,6 +347,8 @@ def golden_json_diff(expected, actual, path)
 # ── Fixture data ────────────────────────────────────────────────────────
 
 CHECKOUT_SHA      = "11d5960a326750d5838078e36cf38b85af677262"
+CHECKOUT_FULL_SHA = "d632683dd7b4114ad314bca15554477dd762a938"
+CHECKOUT_MAIN_SHA = "f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a"
 SETUP_GO_SHA      = "4a3601121dd01d1626a1e23e37211e3254c1c06c"
 CACHE_SHA         = "27d5ce7f107fe9357f9df03efb73ab90386fccae"
 MAIN_BRANCH_SHA   = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
@@ -441,7 +443,7 @@ def golden_json_diff(expected, actual, path)
       dependencies: {
         "actions/checkout@v4.2.0" => {
           "ref" => "v4.2.0",
-          "commit" => "sha1-#{CHECKOUT_SHA}",
+          "commit" => "sha1-#{CHECKOUT_FULL_SHA}",
           "owner_id" => 44036562,
           "repo_id" => 197814629
         }
@@ -460,7 +462,7 @@ def golden_json_diff(expected, actual, path)
       dependencies: {
         "actions/checkout@main" => {
           "ref" => "main",
-          "commit" => "sha1-#{CHECKOUT_SHA}",
+          "commit" => "sha1-#{CHECKOUT_MAIN_SHA}",
           "owner_id" => 44036562,
           "repo_id" => 197814629
         }
@@ -576,11 +578,18 @@ def checkout_graphql_success(srv)
     query = body["query"] || ""
 
     if query.include?("expression")
+      sha = if query.include?("v4.2.0")
+             CHECKOUT_FULL_SHA
+           elsif query.include?("main:")
+             CHECKOUT_MAIN_SHA
+           else
+             CHECKOUT_SHA
+           end
       [200, { "Content-Type" => "application/json" },
        JSON.generate({ data: { a0: {
          nameWithOwner: "actions/checkout",
          object: {
-           oid: CHECKOUT_SHA,
+           oid: sha,
            file: {
              object: {
                text: "name: Checkout\ndescription: Checkout\nruns:\n  using: node20\n  main: dist/index.js\n"
@@ -795,7 +804,7 @@ def wire_checkout_fresh(s, token)
       # the move is benign (ref-moved, not an unreachable pin).
       srv.on(:GET, %r{/repos/actions/checkout/compare/}) do |_req|
         [200, { "Content-Type" => "application/json" },
-         JSON.generate({ status: "behind", merge_base_commit: { sha: CHECKOUT_SHA } })]
+         JSON.generate({ status: "behind", merge_base_commit: { sha: CHECKOUT_MAIN_SHA } })]
       end
     end
     s.env("GH_TOKEN" => "gho_fake_relock_token")

test/scenarios/catalog.yml

@@ -2042,7 +2042,7 @@ scenarios:
         - "'actions/checkout@main':"
         - "ref: 'main'"
         - "commit: 'sha1-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'"
-      lockfile_comment_excludes: "11d5960a326750d5838078e36cf38b85af677262"
+      lockfile_comment_excludes: "f548e57e544e1ff5a4c46bf1e1b8685f8e4a348a"
 
   - name: onboard_roundtrip_v002
     category: onboarding