Skip to content

Commit 9b63f36

Browse files
derek-hoderek-ho
committed
Update tests
Signed-off-by: Derek Ho <dxho@amazon.com>
1 parent a62ea61 commit 9b63f36

File tree

3 files changed

+6
-161
lines changed

3 files changed

+6
-161
lines changed

‎public/apps/configuration/panels/test/__snapshots__/service-account-list.test.tsx.snap

-37
This file was deleted.

‎public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap

-90
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
3939
"href": "/users",
4040
"name": "Internal users",
4141
},
42-
Object {
43-
"href": "/serviceAccounts",
44-
"name": "Service Accounts",
45-
},
4642
Object {
4743
"href": "/permissions",
4844
"name": "Permissions",
@@ -85,10 +81,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
8581
"href": "/users",
8682
"name": "Internal users",
8783
},
88-
Object {
89-
"href": "/serviceAccounts",
90-
"name": "Service Accounts",
91-
},
9284
Object {
9385
"href": "/permissions",
9486
"name": "Permissions",
@@ -131,10 +123,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
131123
"href": "/users",
132124
"name": "Internal users",
133125
},
134-
Object {
135-
"href": "/serviceAccounts",
136-
"name": "Service Accounts",
137-
},
138126
Object {
139127
"href": "/permissions",
140128
"name": "Permissions",
@@ -177,56 +165,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
177165
"href": "/users",
178166
"name": "Internal users",
179167
},
180-
Object {
181-
"href": "/serviceAccounts",
182-
"name": "Service Accounts",
183-
},
184-
Object {
185-
"href": "/permissions",
186-
"name": "Permissions",
187-
},
188-
Object {
189-
"href": "/tenants",
190-
"name": "Tenants",
191-
},
192-
Object {
193-
"href": "/auditLogging",
194-
"name": "Audit logs",
195-
},
196-
]
197-
}
198-
/>
199-
</EuiPageSideBar>
200-
</Route>
201-
<Route
202-
exact={true}
203-
key="/serviceAccounts"
204-
path="/serviceAccounts"
205-
>
206-
<EuiPageSideBar>
207-
<NavPanel
208-
items={
209-
Array [
210-
Object {
211-
"href": "/getstarted",
212-
"name": "Get Started",
213-
},
214-
Object {
215-
"href": "/auth",
216-
"name": "Authentication",
217-
},
218-
Object {
219-
"href": "/roles",
220-
"name": "Roles",
221-
},
222-
Object {
223-
"href": "/users",
224-
"name": "Internal users",
225-
},
226-
Object {
227-
"href": "/serviceAccounts",
228-
"name": "Service Accounts",
229-
},
230168
Object {
231169
"href": "/permissions",
232170
"name": "Permissions",
@@ -269,10 +207,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
269207
"href": "/users",
270208
"name": "Internal users",
271209
},
272-
Object {
273-
"href": "/serviceAccounts",
274-
"name": "Service Accounts",
275-
},
276210
Object {
277211
"href": "/permissions",
278212
"name": "Permissions",
@@ -315,10 +249,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
315249
"href": "/users",
316250
"name": "Internal users",
317251
},
318-
Object {
319-
"href": "/serviceAccounts",
320-
"name": "Service Accounts",
321-
},
322252
Object {
323253
"href": "/permissions",
324254
"name": "Permissions",
@@ -361,10 +291,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
361291
"href": "/users",
362292
"name": "Internal users",
363293
},
364-
Object {
365-
"href": "/serviceAccounts",
366-
"name": "Service Accounts",
367-
},
368294
Object {
369295
"href": "/permissions",
370296
"name": "Permissions",
@@ -407,10 +333,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
407333
"href": "/users",
408334
"name": "Internal users",
409335
},
410-
Object {
411-
"href": "/serviceAccounts",
412-
"name": "Service Accounts",
413-
},
414336
Object {
415337
"href": "/permissions",
416338
"name": "Permissions",
@@ -453,10 +375,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
453375
"href": "/users",
454376
"name": "Internal users",
455377
},
456-
Object {
457-
"href": "/serviceAccounts",
458-
"name": "Service Accounts",
459-
},
460378
Object {
461379
"href": "/permissions",
462380
"name": "Permissions",
@@ -499,10 +417,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
499417
"href": "/users",
500418
"name": "Internal users",
501419
},
502-
Object {
503-
"href": "/serviceAccounts",
504-
"name": "Service Accounts",
505-
},
506420
Object {
507421
"href": "/permissions",
508422
"name": "Permissions",
@@ -550,10 +464,6 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
550464
path="/users"
551465
render={[Function]}
552466
/>
553-
<Route
554-
path="/serviceAccounts"
555-
render={[Function]}
556-
/>
557467
<Route
558468
path="/auditLogging/edit/generalSettings"
559469
render={[Function]}

‎public/apps/configuration/utils/test/internal-user-list-utils.test.tsx

+6-34
Original file line numberDiff line numberDiff line change
@@ -42,54 +42,26 @@ describe('Internal user list utils', () => {
4242
expect(result).toEqual(expectedUserList);
4343
});
4444

45-
it('getUserList calls httpGet with the correct parameters for internal users', async () => {
46-
const httpMock = {}; // Mock HttpStart object
47-
const userType = 'internalaccounts';
48-
49-
const test = await getUserList(httpMock, userType, 'test');
50-
51-
expect(mockedHttpGet).toHaveBeenCalledWith({
52-
http: httpMock,
53-
url: '/api/v1/configuration/internalaccounts',
54-
});
55-
expect(test).toEqual([]);
56-
});
57-
58-
it('getUserList calls httpGet with the correct parameters for service accounts', async () => {
59-
const httpMock = {};
60-
const userType = 'serviceAccounts';
61-
62-
const test = await getUserList(httpMock, userType, 'test');
63-
64-
expect(mockedHttpGet).toHaveBeenCalledWith({
65-
http: httpMock,
66-
url: '/api/v1/configuration/serviceaccounts',
67-
});
68-
expect(test).toEqual([]);
69-
});
70-
71-
it('fetchUserNameList calls httpGet with the correct parameters for service accounts', async () => {
45+
it('getUserList calls httpGet with the correct parameters', async () => {
7246
const httpMock = {};
73-
const userType = 'serviceAccounts';
7447

75-
const test = await fetchUserNameList(httpMock, userType, '');
48+
const test = await getUserList(httpMock, 'test');
7649

7750
expect(mockedHttpGet).toHaveBeenCalledWith({
7851
http: httpMock,
79-
url: '/api/v1/configuration/serviceaccounts',
52+
url: '/api/v1/configuration/internalusers',
8053
});
8154
expect(test).toEqual([]);
8255
});
8356

84-
it('fetchUserNameList calls httpGet with the correct parameters for internal users', async () => {
57+
it('fetchUserNameList calls httpGet with the correct parameters', async () => {
8558
const httpMock = {};
86-
const userType = 'internalaccounts';
8759

88-
const test = await fetchUserNameList(httpMock, userType, '');
60+
const test = await fetchUserNameList(httpMock, '');
8961

9062
expect(mockedHttpGet).toHaveBeenCalledWith({
9163
http: httpMock,
92-
url: '/api/v1/configuration/internalaccounts',
64+
url: '/api/v1/configuration/internalusers',
9365
});
9466
expect(test).toEqual([]);
9567
});

0 commit comments

Comments
 (0)