Skip to content

Commit 883f3e7

Browse files
committed
Merge remote-tracking branch 'origin/main' into agent/fix-ci-scan-mod-envelope-asserts
# Conflicts: # crates/socket-patch-cli/tests/scan/main.rs # docs/testing/bun-compatibility.md # scripts/ci-test-durations.json
2 parents cffeede + 7b6371c commit 883f3e7

13 files changed

Lines changed: 1866 additions & 1311 deletions

File tree

‎crates/socket-patch-cli/tests/cli/telemetry_e2e.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ const HOSTED_UUID: &str = "11111111-1111-4111-8111-111111111111";
10551055
const HOSTED_URL: &str = "https://patch.socket.dev/patch/npm/telemetry-hosted/1.0.0/22222222-2222-4222-8222-222222222222/11111111-1111-4111-8111-111111111111/telemetry-hosted-1.0.0.tgz";
10561056

10571057
/// An npm project whose lockfile resolves [`HOSTED_NAME`] upstream (the
1058-
/// `covgap_commands_scan_hosted.rs` `write_npm_project` shape).
1058+
/// `scan/hosted_fixture.rs` `write_npm_project` shape).
10591059
fn write_hosted_npm_project(root: &Path) {
10601060
std::fs::write(
10611061
root.join("package.json"),

‎crates/socket-patch-cli/tests/get/get_failure_paths.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,7 @@ async fn vendored_lock_held_vendor_step_errors_without_vendor_envelope() {
12041204
}
12051205

12061206
/// Hosted twin of `vendored_lock_held_vendor_step_errors_without_vendor_envelope`
1207-
/// (and of `covgap_commands_scan_hosted::hosted_lock_held_refuses_before_any_write`):
1207+
/// (and of `scan/hosted_failure_paths.rs`'s `hosted_lock_held_refuses_before_any_write`):
12081208
/// `get <uuid> --mode hosted` folds its result into the HOSTED error
12091209
/// envelope, so a held apply lock surfaces as the top-level
12101210
/// `error: {code: "lock_held", message}` object (v5.0: no top-level

‎crates/socket-patch-cli/tests/get/get_fixture.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ pub async fn mount_ghsa_single(server: &MockServer) {
615615
}
616616

617617
/// The hosted reference endpoint granting `uuid` for `purl` at `url` (the
618-
/// `covgap_commands_scan_hosted` fixture shape).
618+
/// `scan/hosted_fixture.rs` fixture shape).
619619
pub async fn mount_granted_reference(server: &MockServer, uuid: &str, purl: &str, url: &str) {
620620
Mock::given(method("POST"))
621621
.and(path(format!("/v0/orgs/{ORG}/patches/package")))

‎crates/socket-patch-cli/tests/in_process_redirect_pnpm.rs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2770,7 +2770,7 @@ async fn hosted_scan_from_npm_member_with_stray_lock_refuses() {
27702770
}
27712771
}
27722772

2773-
/// #1101 (Bun), #1134 (vlt): a workspace member holding a stray
2773+
/// #1101 (Bun), #1134 / #1542 (vlt): a workspace member holding a stray
27742774
/// `bun.lock` / `bun.lockb` / `vlt-lock.json` of its own (one its manager
27752775
/// never reads; members install from the root lock) used to skip the
27762776
/// #884 / #942 refusal. `scan` and `get` pinned the ignored member lock
@@ -2804,6 +2804,19 @@ async fn hosted_scan_from_bun_or_vlt_member_with_stray_lock_refuses() {
28042804
"vlt-lock.json",
28052805
vlt_text.as_str(),
28062806
),
2807+
// #1542: vlt lists members through extglobs too.
2808+
(
2809+
"vlt-lock.json",
2810+
Some(r#"{"workspaces":["packages/+(a|b)"]}"#),
2811+
"vlt-lock.json",
2812+
vlt_text.as_str(),
2813+
),
2814+
(
2815+
"vlt-lock.json",
2816+
Some(r#"{"workspaces":["packages/@(a|b)"]}"#),
2817+
"vlt-lock.json",
2818+
vlt_text.as_str(),
2819+
),
28072820
] {
28082821
let tmp = tempfile::tempdir().unwrap();
28092822
let member = write_package_json_workspace(tmp.path(), root_lock, false);

0 commit comments

Comments
 (0)