Skip to content
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.

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

feat(DTFS2-6892): update mock builder, enforce complete defaults, document mocked class methods #4113

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
6f01382
feat(dtfs2-6892): add api to upsert user
AlexBramhill Nov 25, 2024
70c1db3
feat(dtfs2-6892): add handle redirect to entra id service
AlexBramhill Nov 25, 2024
4dfd7dd
feat(dtfs2-6892): add user parital login data error
AlexBramhill Nov 27, 2024
51e6a20
Revert "feat(dtfs2-6892): add api to upsert user"
AlexBramhill Nov 27, 2024
eae68f8
Revert "feat(dtfs2-6892): add handle redirect to entra id service"
AlexBramhill Nov 27, 2024
9300c66
feat(dtfs2-6892): add login service
AlexBramhill Nov 27, 2024
d954593
feat(dtfs2-6892): add login service
AlexBramhill Nov 27, 2024
35fc108
feat(dtfs2-6892): add login service
AlexBramhill Nov 27, 2024
f973209
feat(dtfs2-6892): move entra to tfm api
AlexBramhill Nov 27, 2024
019ef20
feat(dtfs2-6892): move entra to tfm api
AlexBramhill Nov 27, 2024
9df20ed
feat(dtfs2-6892): move entra to tfm api
AlexBramhill Nov 27, 2024
6aa48cc
feat(dtfs2-6892): move entra to tfm api
AlexBramhill Nov 29, 2024
c036ea2
feat(dtfs2-6892): move entra to tfm api
AlexBramhill Nov 29, 2024
05ff7e4
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Nov 29, 2024
d5d1bb4
feat(dtfs2-6892): add object id schema for tfm sso
AlexBramhill Dec 3, 2024
fb5a89c
feat(dtfs2-6892): add tfm session user commonisation to dtfs-central-api
AlexBramhill Dec 3, 2024
ca22017
feat(dtfs2-6892): add tfm session user commonisation to dtfs-central-api
AlexBramhill Dec 3, 2024
e2eecd1
feat(dtfs2-6892): add tfm session user commonisation to tfm-api
AlexBramhill Dec 3, 2024
9a0b176
feat(dtfs2-6892): fix eslint errors
AlexBramhill Dec 3, 2024
6668392
feat(dtfs2-6892): update tfm ui
AlexBramhill Dec 3, 2024
eb080b3
feat(dtfs2-6892): fix create tfm user request
AlexBramhill Dec 3, 2024
d3da1ad
feat(dtfs2-6892): update schema tests
AlexBramhill Dec 4, 2024
bdf5a87
feat(dtfs2-6892): update entra user id tests
AlexBramhill Dec 4, 2024
2e412f4
feat(dtfs2-6892): update entra user id auth result tests
AlexBramhill Dec 4, 2024
b74aeab
feat(dtfs2-6892): fix tests
AlexBramhill Dec 4, 2024
a2bf551
feat(dtfs2-6892): fix tests
AlexBramhill Dec 4, 2024
f8c998d
feat(dtfs2-6892): fix tests
AlexBramhill Dec 4, 2024
74c8cac
feat(dtfs2-6892): add unix timestamp tests
AlexBramhill Dec 4, 2024
836239c
feat(dtfs2-6892): tidy, add comments
AlexBramhill Dec 4, 2024
7c39850
feat(dtfs2-6892): rename field to param
AlexBramhill Dec 4, 2024
a5d8e78
feat(dtfs2-6892): fix test
AlexBramhill Dec 4, 2024
010cb9a
feat(dtfs2-6892): add missing type for get auth code
AlexBramhill Nov 29, 2024
7b4def0
feat(dtfs2-6892): add handle sso redirect form types
AlexBramhill Nov 29, 2024
749e267
feat(dtfs2-6892): add handle sso redirect form types
AlexBramhill Nov 29, 2024
1ea6af6
feat(dtfs2-6892): update user session to be split between fully authe…
AlexBramhill Nov 29, 2024
cdb3e5f
feat(dtfs2-6892): update tfm ui
AlexBramhill Nov 29, 2024
e48b42d
feat(dtfs2-6892): add lost tfm api file changes
AlexBramhill Dec 3, 2024
cf47e66
feat(dtfs2-6892): add lost files
AlexBramhill Dec 3, 2024
6d2e06d
feat(dtfs2-6892): success redirect to be optional
AlexBramhill Dec 3, 2024
4afebe8
feat(dtfs2-6892): update sso controller
AlexBramhill Dec 4, 2024
1225d7e
feat(dtfs2-6892): move api test file into separate tests
AlexBramhill Dec 5, 2024
3681433
feat(dtfs2-6892): update eslint to allow for _getJsonData
AlexBramhill Dec 6, 2024
677f531
feat(dtfs2-6892): add sso controller get auth code url tests
AlexBramhill Dec 6, 2024
c1e97ea
feat(dtfs2-6892): add builder
AlexBramhill Dec 6, 2024
e785461
feat(dtfs2-6892): update test api error constructor
AlexBramhill Dec 6, 2024
48b4125
feat(dtfs2-6892): add with api error tests helper
AlexBramhill Dec 6, 2024
e31235d
feat(dtfs2-6892): remove unused upsert functions
AlexBramhill Dec 6, 2024
eb16e75
feat(dtfs2-6892): update error handling and tests for get auth code
AlexBramhill Dec 6, 2024
a9280e9
feat(dtfs2-6892): update user service to not be static
AlexBramhill Dec 6, 2024
bf6056c
feat(dtfs2-6892): add sso controller tests for handle sso redirect form
AlexBramhill Dec 9, 2024
fda5a2d
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Dec 9, 2024
0a85711
Merge branch 'feat/DTFS2-6892/add-frontend-upsert-user-functionality'…
AlexBramhill Dec 9, 2024
a590fa5
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Dec 9, 2024
cca4a64
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Dec 9, 2024
4513794
feat(dtfs2-6892): add tests
AlexBramhill Dec 9, 2024
466f33a
feat(dtfs2-6892): remove tfm ui changes
AlexBramhill Dec 9, 2024
335708a
feat(dtfs2-6892): remove tfm ui changes
AlexBramhill Dec 9, 2024
e230163
feat(dtfs2-6892): update mock builder
AlexBramhill Dec 11, 2024
b9ffee8
feat(DTFS2-6892): renamed file
Jan 2, 2025
6f04dad
feat(DTFS2-6892): update mock builder to require complete defaults, a…
AlexBramhill Jan 2, 2025
15ecd10
feat(DTFS2-6892): add object id schema for tfm sso (#4027)
AlexBramhill Jan 2, 2025
1bd2233
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Jan 3, 2025
351221d
Merge branch 'feat/DTFS2-6892/add-frontend-upsert-user-functionality'…
AlexBramhill Jan 3, 2025
f49019a
fix(dtfs2-7647): update tfm session user imports
AlexBramhill Jan 3, 2025
42d9080
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Jan 6, 2025
6543278
Revert "feat(DTFS2-6892): update mock builder to require complete def…
AlexBramhill Jan 6, 2025
4fe1900
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Jan 6, 2025
0d524c6
Merge branch 'feat/DTFS2-6892/add-frontend-upsert-user-functionality'…
AlexBramhill Jan 6, 2025
9aa8593
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Jan 6, 2025
71e6a2b
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Jan 6, 2025
2e64296
Merge branch 'feat/DTFS2-6892/add-token-issuance' into feat/DTFS2-689…
AlexBramhill Jan 6, 2025
d459281
feat(dtfs2-6892): add readme
AlexBramhill Jan 6, 2025
8fe75fd
feat(dtfs2-6892): add readme
AlexBramhill Jan 6, 2025
4744df8
feat(dtfs2-6892): update tests
AlexBramhill Jan 7, 2025
cd59c23
feat(dtfs2-6892): review comments
AlexBramhill Jan 7, 2025
f1d97f2
feat(dtfs2-6892): review comments
AlexBramhill Jan 7, 2025
9f60efa
feat(dtfs2-6892): review comments
AlexBramhill Jan 7, 2025
d6929c3
feat(dtfs2-6892): review comments
AlexBramhill Jan 7, 2025
9ebfdac
feat(dtfs2-6892): update to review comments
AlexBramhill Jan 14, 2025
ec175ad
feat(dtfs2-7693): update to review comments
AlexBramhill Jan 14, 2025
b827c69
feat(dtfs2-7693): update to review comments
AlexBramhill Jan 14, 2025
3e80688
feat(dtfs2-6892): clarify how zod union works
AlexBramhill Jan 22, 2025
6c08a10
feat(dtfs2-6892): update to review comments
AlexBramhill Jan 22, 2025
4829ecc
feat(dtfs2-6892): add sso controller test
AlexBramhill Jan 23, 2025
3f94a37
feat(dtfs2-6892): update controller reroute, add tests
AlexBramhill Jan 23, 2025
f2e2f5e
feat(dtfs2-6892): uninstall msal node from tfm ui
AlexBramhill Jan 23, 2025
bbc537f
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Jan 23, 2025
f8052c8
Merge branch 'feat/DTFS2-6892/add-frontend-upsert-user-functionality'…
AlexBramhill Jan 23, 2025
ec2e327
feat(dtfs2-6892): remove todo
AlexBramhill Jan 23, 2025
a473a42
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Jan 23, 2025
a78e8a8
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Jan 23, 2025
705d0b6
feat(dtfs2-6892): update mock builder to use test helper
AlexBramhill Jan 24, 2025
0d04d3b
Merge branch 'feat/DTFS2-6892/add-token-issuance' into feat/DTFS2-689…
AlexBramhill Jan 24, 2025
d4abcad
feat(dtfs2-6892): review comments
AlexBramhill Jan 28, 2025
ef3d702
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Jan 31, 2025
b1b1e5f
Merge branch 'feat/DTFS2-6892/add-frontend-upsert-user-functionality'…
AlexBramhill Jan 31, 2025
6ff0fbc
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Jan 31, 2025
93b5586
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Jan 31, 2025
ab603fd
Merge branch 'feat/DTFS2-6892/add-token-issuance' into feat/DTFS2-689…
AlexBramhill Jan 31, 2025
494366e
feat(dtfs2-6892): fix lint issue
AlexBramhill Feb 3, 2025
5115a86
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Feb 4, 2025
b9ccfda
Merge branch 'feat/DTFS2-6892/add-frontend-upsert-user-functionality'…
AlexBramhill Feb 4, 2025
5f528b5
feat(dtfs2-6892): fix following rebase
AlexBramhill Feb 4, 2025
9e98f19
feat(dtfs2-6892): fix following rebase
AlexBramhill Feb 4, 2025
c3adb9d
Merge branch 'main' into feat/DTFS2-6892/add-frontend-upsert-user-fun…
AlexBramhill Feb 4, 2025
da638aa
Merge branch 'feat/DTFS2-6892/add-frontend-upsert-user-functionality'…
AlexBramhill Feb 4, 2025
33cc3a3
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Feb 4, 2025
038b04b
feat(dtfs2-6892): fix following rebase
AlexBramhill Feb 4, 2025
78a813d
feat(dtfs2-6892): fix following rebase
AlexBramhill Feb 4, 2025
2a1f587
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Feb 4, 2025
7e725ae
feat(dtfs2-6892): fix following rebase
AlexBramhill Feb 5, 2025
7d7a8a5
Merge branch 'main' into feat/DTFS2-6892/commonise-tfm-session-user
AlexBramhill Feb 5, 2025
341251f
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Feb 5, 2025
988cf25
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Feb 5, 2025
47ee83c
feat(dtfs2-6892): fix following rebase
AlexBramhill Feb 5, 2025
87315e2
Merge branch 'feat/DTFS2-6892/add-token-issuance' into feat/DTFS2-689…
AlexBramhill Feb 5, 2025
d889fb1
feat(dtfs2-6892): review comments
AlexBramhill Feb 5, 2025
60df464
feat(dtfs2-6892): review comments
AlexBramhill Feb 5, 2025
c016d28
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Feb 5, 2025
4ca17e3
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Feb 5, 2025
1631e69
Merge branch 'feat/DTFS2-6892/add-token-issuance' into feat/DTFS2-689…
AlexBramhill Feb 5, 2025
1ef4091
feat(dtfs2-6892): review comments
AlexBramhill Feb 6, 2025
897e457
Merge branch 'main' into feat/DTFS2-6892/commonise-tfm-session-user
AlexBramhill Feb 7, 2025
8589fc2
feat(dtfs2-6892): review comments
AlexBramhill Feb 10, 2025
0e0fffa
feat(dtfs2-6892): review comments
AlexBramhill Feb 10, 2025
12c1215
feat(dtfs2-6892): review comments
AlexBramhill Feb 10, 2025
8d33fb8
Merge branch 'feat/DTFS2-6892/commonise-tfm-session-user' into feat/D…
AlexBramhill Feb 10, 2025
4cf11c9
Merge branch 'main' into feat/DTFS2-6892/add-schema-tests-for-commoni…
AlexBramhill Feb 10, 2025
9d2856c
feat(dtfs2-6892): review comments
AlexBramhill Feb 10, 2025
40d7383
Merge branch 'main' into feat/DTFS2-6892/add-schema-tests-for-commoni…
AlexBramhill Feb 12, 2025
5c40efe
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Feb 12, 2025
08d6ce1
feat(dtfs2-6892): review comments
AlexBramhill Feb 12, 2025
694c80b
feat(dtfs2-6892): fix issue due to unit test and e2e tests running on…
AlexBramhill Feb 12, 2025
8552633
feat(dtfs2-6892): fix issue due to unit test and e2e tests running on…
AlexBramhill Feb 12, 2025
5f3b106
feat(dtfs2-6892): fix issue due to unit test and e2e tests running on…
AlexBramhill Feb 12, 2025
7fdc71e
feat(dtfs2-6892): fix issue due to unit test and e2e tests running on…
AlexBramhill Feb 12, 2025
f09d87e
feat(dtfs2-6892): fix issue due to unit test and e2e tests running on…
AlexBramhill Feb 13, 2025
8621e1b
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Feb 13, 2025
41a5dc7
Merge branch 'feat/DTFS2-6892/add-schema-tests-for-commonised-tfm-use…
AlexBramhill Feb 13, 2025
5e8d737
feat(dtfs2-6892): review comments
AlexBramhill Feb 13, 2025
ffea733
Merge branch 'main' into feat/DTFS2-6892/add-token-issuance
AlexBramhill Feb 13, 2025
a73928a
Merge branch 'main' into feat/DTFS2-6892/add-token-issuance
AlexBramhill Feb 13, 2025
e331e12
feat(dtfs2-6892): remove need for backend separate schema tests
AlexBramhill Feb 13, 2025
6874d39
feat(dtfs2-6892): remove need for backend separate schema tests
AlexBramhill Feb 13, 2025
9a2d688
Merge branch 'feat/DTFS2-6892/add-token-issuance' into feat/DTFS2-689…
AlexBramhill Feb 13, 2025
928fec2
Merge branch 'main' into feat/DTFS2-6892/update-mock-builder-to-autom…
AlexBramhill Feb 14, 2025
7e542bc
feat(dtfs2-6892): review comments
AlexBramhill Feb 14, 2025
1b73229
Merge branch 'main' into feat/DTFS2-6892/update-mock-builder-to-autom…
AlexBramhill Feb 14, 2025
ef532b4
Merge branch 'main' into feat/DTFS2-6892/update-mock-builder-to-autom…
abhi-markan Feb 18, 2025
f6fd4c2
feat(DTFS2-6892): update mock builder, enforce complete defaults
Feb 24, 2025
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
2 changes: 1 addition & 1 deletion libs/common/src/test-helpers/mock-builders/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './mock-builder.mock.builder';
export * from './mock-builder';
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type Mocked<T> = {
* // another-test-file.test.ts
* // Usage in a test where a field needs to have a specific value
* const user = new UserMockBuilder()
* .with({ email: 'new.email@ukef.gov.uk' })
* .with({ email: 'new.email@ukexportfinance.gov.uk' })
* .build()
* ```

Expand Down Expand Up @@ -91,7 +91,7 @@ export abstract class BaseMockBuilder<TClass extends object> {
* ```ts
* const user = new UserMockBuilder()
* .with({
* email: 'new.email@ukef.gov.uk',
* email: 'new.email@ukexportfinance.gov.uk',
* givenName: 'Fred',
* })
* .build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ describe('SsoController', () => {
beforeEach(() => {
resetAllWhenMocks();
jest.resetAllMocks();
jest.resetAllMocks();
entraIdService = new EntraIdServiceMockBuilder().with({ getAuthCodeUrl: getAuthCodeUrlMock }).build();
userService = new UserServiceMockBuilder().build();
ssoController = new SsoController({ entraIdService, userService });
Expand Down
Loading