From 3211c7c37aff3d766b0bb329eb174925e7dfd406 Mon Sep 17 00:00:00 2001 From: Andrew Rumble Date: Tue, 7 Oct 2025 17:50:02 +0100 Subject: [PATCH] Make test admin users engineers GitOrigin-RevId: 627b5b05eefdfa675937764b7c798e99ab6ef37e --- services/web/scripts/e2e_test_setup.mjs | 1 + .../web/test/acceptance/src/AdminPrivilegeAvailableTests.mjs | 1 + services/web/test/acceptance/src/AuthorizationTests.mjs | 1 + services/web/test/acceptance/src/helpers/User.mjs | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/services/web/scripts/e2e_test_setup.mjs b/services/web/scripts/e2e_test_setup.mjs index fa8bfed0dc..01574a8e9b 100644 --- a/services/web/scripts/e2e_test_setup.mjs +++ b/services/web/scripts/e2e_test_setup.mjs @@ -32,6 +32,7 @@ async function createUser(email) { $set: { // Set admin flag. isAdmin: email.startsWith('admin+'), + adminRoles: email.startsWith('admin+') ? ['engineering'] : [], // Disable spell-checking for performance and flakiness reasons. 'ace.spellCheckLanguage': '', // Override features. diff --git a/services/web/test/acceptance/src/AdminPrivilegeAvailableTests.mjs b/services/web/test/acceptance/src/AdminPrivilegeAvailableTests.mjs index 93465bb0bf..ad95218dc2 100644 --- a/services/web/test/acceptance/src/AdminPrivilegeAvailableTests.mjs +++ b/services/web/test/acceptance/src/AdminPrivilegeAvailableTests.mjs @@ -16,6 +16,7 @@ describe('AdminPrivilegeAvailable', function () { adminUser = new User() await adminUser.ensureUserExists() await adminUser.ensureAdmin() + await adminUser.ensureAdminRole('engineering') await adminUser.login() }) diff --git a/services/web/test/acceptance/src/AuthorizationTests.mjs b/services/web/test/acceptance/src/AuthorizationTests.mjs index dca3a2383e..63001af6f8 100644 --- a/services/web/test/acceptance/src/AuthorizationTests.mjs +++ b/services/web/test/acceptance/src/AuthorizationTests.mjs @@ -212,6 +212,7 @@ describe('Authorization', function () { this.other2 = new User() this.anon = new User() this.site_admin = new User({ email: 'admin@example.com' }) + settings.adminRolesEnabled = false await Promise.all([ this.owner.login(), this.other1.login(), diff --git a/services/web/test/acceptance/src/helpers/User.mjs b/services/web/test/acceptance/src/helpers/User.mjs index 4371ecbe49..41827f16f0 100644 --- a/services/web/test/acceptance/src/helpers/User.mjs +++ b/services/web/test/acceptance/src/helpers/User.mjs @@ -579,6 +579,10 @@ class User { this.mongoUpdate({ $set: { isAdmin: true } }, callback) } + ensureAdminRole(role, callback) { + this.mongoUpdate({ $addToSet: { adminRoles: 'engineering' } }, callback) + } + ensureStaffAccess(flag, callback) { const update = { $set: {} } update.$set[`staffAccess.${flag}`] = true