Skip to content

Bump @defra/forms-model from 3.0.619 to 3.0.638 in the forms group #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbarnsley10 merged 4 commits into from
Mar 25, 2026
Merged

Bump @defra/forms-model from 3.0.619 to 3.0.638 in the forms group #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f9ce80
Bump @defra/forms-model from 3.0.619 to 3.0.638 in the forms group
dependabot[bot] Mar 19, 2026
587dba1
Lint fix
jbarnsley10 Mar 20, 2026
ad980e3
Fixed integration test
jbarnsley10 Mar 20, 2026
3edfdda
Fixed integration tests
jbarnsley10 Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
215 changes: 4 additions & 211 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@aws-sdk/client-sns": "^3.848.0",
"@azure/identity": "4.10.2",
"@azure/msal-node": "3.6.4",
"@defra/forms-model": "3.0.619",
"@defra/forms-model": "3.0.638",
"@defra/hapi-tracing": "^1.26.0",
"@elastic/ecs-pino-format": "^1.5.0",
"@hapi/hapi": "^21.4.0",
Expand Down
3 changes: 3 additions & 0 deletions src/services/user.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,12 +739,15 @@ describe('User service', () => {

const existingUser = {
userId: 'azure-user-1',
displayName: 'azure user 1',
email: 'azure-user-1@test.com',
roles: [Roles.Admin],
scopes: ['some-scope']
}

const existingUsersMap = new Map([['azure-user-1', existingUser]])

// @ts-expect-error - partial mock with invalid scope
await processAdminUser(mockMember, mockSession, existingUsersMap)

expect(update).toHaveBeenCalledWith(
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const auth = {
name: 'Enrique Chase (Defra)',
scp: 'forms.user',
sub: 'hgtL_1p2Me5JkBB6JeB20PyU3YDuP9PjEZwi7m1QGng',
oid: '86758ba9-92e7-4287-9751-7705e449688e'
oid: 'aaaaaaaa-1111-2222-3333-444444444444'
},
scope: RoleScopes[Roles.Admin],
roles: [Roles.Admin]
Expand All @@ -29,7 +29,7 @@ export const superadminAuth = {
name: 'Super Admin (Defra)',
scp: 'forms.user',
sub: 'superadmin-sub-1',
oid: 'aaaaaaaa-1111-2222-3333-444444444444'
oid: '86758ba9-92e7-4287-9751-7705e449688e'
},
scope: RoleScopes[Roles.Superadmin],
roles: [Roles.Superadmin]
Expand Down
4 changes: 2 additions & 2 deletions test/integration/postman/forms-entitlement-api-ci-mock.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
" pm.response.to.have.status(200);",
" const responseData = pm.response.json();",
" pm.expect(responseData.entities).to.be.an('array');",
" pm.expect(responseData.entities.length).to.eq(2);",
" pm.expect(responseData.entities.length).to.eq(3);",
"});",
""
],
Expand Down Expand Up @@ -310,7 +310,7 @@
"pm.test(\"response is ok\", function () {",
" pm.response.to.have.status(200);",
" const responseData = pm.response.json();",
" pm.expect(responseData.entities.length).to.eq(1);",
" pm.expect(responseData.entities.length).to.eq(2);",
" const userId = pm.collectionVariables.get('user_1_id');",
" pm.expect(responseData.entities[0].userId).to.eq(userId);",
" pm.expect(responseData.entities[0].roles).to.include('admin');",
Expand Down
20 changes: 20 additions & 0 deletions test/integration/seed-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,26 @@ const testUsers = [
scopes: [Scopes.FormRead, Scopes.FormEdit],
createdAt: new Date(),
updatedAt: new Date()
},
{
userId: '86758ba9-92e7-4287-9751-7705e449688e',
email: 'newman-service-account@internal.test',
displayName: 'Newman Test User',
roles: ['superadmin'],
scopes: [
Scopes.FormRead,
Scopes.FormEdit,
Scopes.FormDelete,
Scopes.FormPublish,
Scopes.UserCreate,
Scopes.UserEdit,
Scopes.UserDelete,
Scopes.FormsBackup,
Scopes.ResetSaveAndExit,
Scopes.DeadLetterQueues
],
createdAt: new Date(),
updatedAt: new Date()
}
]

Expand Down
Loading