From 39cc0351d08bafb34a235bd348c8538ad015cfa5 Mon Sep 17 00:00:00 2001 From: Michael Novotny Date: Fri, 25 Sep 2026 11:47:14 -0500 Subject: [PATCH 1/3] fix(repo): guard empty error lists in the integration role helper Co-Authored-By: Claude Fable 5.1 --- .changeset/guard-empty-error-list-role-helper.md | 2 ++ integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .changeset/guard-empty-error-list-role-helper.md diff --git a/.changeset/guard-empty-error-list-role-helper.md b/.changeset/guard-empty-error-list-role-helper.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/guard-empty-error-list-role-helper.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts b/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts index 619b41caf61..a89646addee 100644 --- a/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts +++ b/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts @@ -61,7 +61,7 @@ export async function bulkCreateFeaturesPermissionsRoles( // we are okay if the error is assigning an existing permission if ( isClerkAPIResponseError(err) && - err.errors[0].code !== 'organization_role_permission_association_exists' + err.errors[0]?.code !== 'organization_role_permission_association_exists' ) { throw err; } From 2fac82075c170e5ad864cb57a9d216f9c9bdfa1a Mon Sep 17 00:00:00 2001 From: Michael Novotny Date: Fri, 25 Sep 2026 11:52:07 -0500 Subject: [PATCH 2/3] fix(repo): rethrow non-API errors in the integration role helper Co-Authored-By: Claude Fable 5.1 --- integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts b/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts index a89646addee..e57d8f51711 100644 --- a/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts +++ b/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts @@ -60,7 +60,7 @@ export async function bulkCreateFeaturesPermissionsRoles( } catch (err: unknown) { // we are okay if the error is assigning an existing permission if ( - isClerkAPIResponseError(err) && + !isClerkAPIResponseError(err) || err.errors[0]?.code !== 'organization_role_permission_association_exists' ) { throw err; From f9ecc71fcc819a9f33b36a813539988e2f82449f Mon Sep 17 00:00:00 2001 From: Michael Novotny Date: Mon, 28 Sep 2026 11:00:23 -0500 Subject: [PATCH 3/3] refactor(repo): split the integration role helper error guard Co-Authored-By: Claude Fable 5.1 --- .../testUtils/bulkCreateFeaturesPermissionsRoles.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts b/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts index e57d8f51711..72cbdfb8610 100644 --- a/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts +++ b/integration/testUtils/bulkCreateFeaturesPermissionsRoles.ts @@ -58,11 +58,11 @@ export async function bulkCreateFeaturesPermissionsRoles( permissionId, }); } catch (err: unknown) { + if (!isClerkAPIResponseError(err)) { + throw err; + } // we are okay if the error is assigning an existing permission - if ( - !isClerkAPIResponseError(err) || - err.errors[0]?.code !== 'organization_role_permission_association_exists' - ) { + if (err.errors[0]?.code !== 'organization_role_permission_association_exists') { throw err; } }