Skip to content

Commit eba7ef2

Browse files
Griffin-SullivanGriffin-Sullivan
authored
Limit use of mockBFFResponse in mock tests (kubeflow#575)
Signed-off-by: Griffin-Sullivan <[email protected]>
1 parent aeb637b commit eba7ef2

File tree

8 files changed

+80
-103
lines changed

8 files changed

+80
-103
lines changed

‎clients/ui/frontend/src/__mocks__/mockBFFResponse.ts‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/api.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { GenericStaticResponse, RouteHandlerController } from 'cypress/types/net-stubbing';
2+
import { mockBFFResponse } from '~/__mocks__/utils';
23
import type {
34
ModelArtifact,
45
ModelArtifactList,
56
ModelRegistry,
6-
ModelRegistryBody,
77
ModelVersion,
88
ModelVersionList,
99
RegisteredModel,
@@ -35,7 +35,7 @@ declare global {
3535
interceptApi: ((
3636
type: 'GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models',
3737
options: { path: { modelRegistryName: string; apiVersion: string } },
38-
response: ApiResponse<ModelRegistryBody<RegisteredModelList>>,
38+
response: ApiResponse<RegisteredModelList>,
3939
) => Cypress.Chainable<null>) &
4040
((
4141
type: 'POST /api/:apiVersion/model_registry/:modelRegistryName/registered_models',
@@ -47,7 +47,7 @@ declare global {
4747
options: {
4848
path: { modelRegistryName: string; apiVersion: string; registeredModelId: number };
4949
},
50-
response: ApiResponse<ModelRegistryBody<ModelVersionList>>,
50+
response: ApiResponse<ModelVersionList>,
5151
) => Cypress.Chainable<null>) &
5252
((
5353
type: 'POST /api/:apiVersion/model_registry/:modelRegistryName/registered_models/:registeredModelId/versions',
@@ -61,28 +61,28 @@ declare global {
6161
options: {
6262
path: { modelRegistryName: string; apiVersion: string; registeredModelId: number };
6363
},
64-
response: ApiResponse<ModelRegistryBody<RegisteredModel>>,
64+
response: ApiResponse<RegisteredModel>,
6565
) => Cypress.Chainable<null>) &
6666
((
6767
type: 'PATCH /api/:apiVersion/model_registry/:modelRegistryName/registered_models/:registeredModelId',
6868
options: {
6969
path: { modelRegistryName: string; apiVersion: string; registeredModelId: number };
7070
},
71-
response: ApiResponse<ModelRegistryBody<RegisteredModel>>,
71+
response: ApiResponse<RegisteredModel>,
7272
) => Cypress.Chainable<null>) &
7373
((
7474
type: 'GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId',
7575
options: {
7676
path: { modelRegistryName: string; apiVersion: string; modelVersionId: number };
7777
},
78-
response: ApiResponse<ModelRegistryBody<ModelVersion>>,
78+
response: ApiResponse<ModelVersion>,
7979
) => Cypress.Chainable<null>) &
8080
((
8181
type: 'GET /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId/artifacts',
8282
options: {
8383
path: { modelRegistryName: string; apiVersion: string; modelVersionId: number };
8484
},
85-
response: ApiResponse<ModelRegistryBody<ModelArtifactList>>,
85+
response: ApiResponse<ModelArtifactList>,
8686
) => Cypress.Chainable<null>) &
8787
((
8888
type: 'POST /api/:apiVersion/model_registry/:modelRegistryName/model_versions/:modelVersionId/artifacts',
@@ -96,12 +96,12 @@ declare global {
9696
options: {
9797
path: { modelRegistryName: string; apiVersion: string; modelVersionId: number };
9898
},
99-
response: ApiResponse<ModelRegistryBody<ModelVersion | undefined>>,
99+
response: ApiResponse<ModelVersion | undefined>,
100100
) => Cypress.Chainable<null>) &
101101
((
102102
type: 'GET /api/:apiVersion/model_registry',
103103
options: { path: { apiVersion: string } },
104-
response: ApiResponse<ModelRegistryBody<ModelRegistry[]>>,
104+
response: ApiResponse<ModelRegistry[]>,
105105
) => Cypress.Chainable<null>);
106106
}
107107
}
@@ -136,7 +136,7 @@ Cypress.Commands.add(
136136
}
137137
return cy.intercept(
138138
{ method, pathname, query: options?.query, ...(options?.times && { times: options.times }) },
139-
response,
139+
mockBFFResponse(response),
140140
);
141141
},
142142
);

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { mockModelVersionList } from '~/__mocks__/mockModelVersionList';
55
import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
66
import { mockRegisteredModelList } from '~/__mocks__/mockRegisteredModelsList';
77
import { labelModal, modelRegistry } from '~/__tests__/cypress/cypress/pages/modelRegistry';
8-
import { mockBFFResponse } from '~/__mocks__/mockBFFResponse';
98
import type { ModelRegistry, ModelVersion, RegisteredModel } from '~/app/types';
109
import { be } from '~/__tests__/cypress/cypress/utils/should';
1110
import { MODEL_REGISTRY_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
@@ -69,15 +68,15 @@ const initIntercepts = ({
6968
{
7069
path: { apiVersion: MODEL_REGISTRY_API_VERSION },
7170
},
72-
mockBFFResponse(modelRegistries),
71+
modelRegistries,
7372
);
7473

7574
cy.interceptApi(
7675
`GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models`,
7776
{
7877
path: { modelRegistryName: 'modelregistry-sample', apiVersion: MODEL_REGISTRY_API_VERSION },
7978
},
80-
mockBFFResponse(mockRegisteredModelList({ items: registeredModels })),
79+
mockRegisteredModelList({ items: registeredModels }),
8180
);
8281

8382
cy.interceptApi(
@@ -89,7 +88,7 @@ const initIntercepts = ({
8988
registeredModelId: 1,
9089
},
9190
},
92-
mockBFFResponse(mockModelVersionList({ items: modelVersions })),
91+
mockModelVersionList({ items: modelVersions }),
9392
);
9493
};
9594

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistrySettings/modelRegistrySettings.cy.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
22
import type { ModelRegistry } from '~/app/types';
3-
import { mockBFFResponse } from '~/__mocks__/mockBFFResponse';
43
import { modelRegistrySettings } from '~/__tests__/cypress/cypress/pages/modelRegistrySettings';
54

65
type HandlersProps = {
@@ -28,7 +27,7 @@ const initIntercepts = ({
2827
{
2928
path: { apiVersion: MODEL_REGISTRY_API_VERSION },
3029
},
31-
mockBFFResponse(modelRegistries),
30+
modelRegistries,
3231
);
3332
};
3433

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionArchive.cy.ts‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ const initIntercepts = ({
6363
{
6464
path: { apiVersion: MODEL_REGISTRY_API_VERSION },
6565
},
66-
mockBFFResponse(modelRegistries),
66+
modelRegistries,
6767
);
6868

6969
cy.interceptApi(
7070
`GET /api/:apiVersion/model_registry/:modelRegistryName/registered_models`,
7171
{
7272
path: { modelRegistryName: 'modelregistry-sample', apiVersion: MODEL_REGISTRY_API_VERSION },
7373
},
74-
mockBFFResponse(mockRegisteredModelList({ size: registeredModelsSize })),
74+
mockRegisteredModelList({ size: registeredModelsSize }),
7575
);
7676

7777
cy.interceptApi(
@@ -83,11 +83,9 @@ const initIntercepts = ({
8383
registeredModelId: 1,
8484
},
8585
},
86-
mockBFFResponse(
87-
mockModelVersionList({
88-
items: modelVersions,
89-
}),
90-
),
86+
mockModelVersionList({
87+
items: modelVersions,
88+
}),
9189
);
9290

9391
cy.interceptApi(
@@ -99,7 +97,7 @@ const initIntercepts = ({
9997
registeredModelId: 1,
10098
},
10199
},
102-
mockBFFResponse(mockRegisteredModel({ name: 'test-1' })),
100+
mockRegisteredModel({ name: 'test-1' }),
103101
);
104102

105103
cy.interceptApi(
@@ -111,9 +109,7 @@ const initIntercepts = ({
111109
modelVersionId: 2,
112110
},
113111
},
114-
mockBFFResponse(
115-
mockModelVersion({ id: '2', name: 'model version 2', state: ModelState.ARCHIVED }),
116-
),
112+
mockModelVersion({ id: '2', name: 'model version 2', state: ModelState.ARCHIVED }),
117113
);
118114

119115
cy.interceptApi(
@@ -125,7 +121,7 @@ const initIntercepts = ({
125121
modelVersionId: 3,
126122
},
127123
},
128-
mockBFFResponse(mockModelVersion({ id: '3', name: 'model version 3', state: ModelState.LIVE })),
124+
mockModelVersion({ id: '3', name: 'model version 3', state: ModelState.LIVE }),
129125
);
130126
};
131127

@@ -199,7 +195,7 @@ describe('Restoring archive version', () => {
199195
modelVersionId: 2,
200196
},
201197
},
202-
mockBFFResponse(mockModelVersion({})),
198+
mockModelVersion({}),
203199
).as('versionRestored');
204200

205201
initIntercepts({});
@@ -228,7 +224,7 @@ describe('Restoring archive version', () => {
228224
modelVersionId: 2,
229225
},
230226
},
231-
mockBFFResponse(mockModelVersion({})),
227+
mockModelVersion({}),
232228
).as('versionRestored');
233229

234230
initIntercepts({});
@@ -257,7 +253,7 @@ describe('Archiving version', () => {
257253
modelVersionId: 3,
258254
},
259255
},
260-
mockBFFResponse(mockModelVersion({})),
256+
mockModelVersion({}),
261257
).as('versionArchived');
262258

263259
initIntercepts({});
@@ -287,7 +283,7 @@ describe('Archiving version', () => {
287283
modelVersionId: 3,
288284
},
289285
},
290-
mockBFFResponse(mockModelVersion({})),
286+
mockModelVersion({}),
291287
).as('versionArchived');
292288

293289
initIntercepts({});

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionDetails.cy.ts‎

Lines changed: 39 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* eslint-disable camelcase */
22
import { verifyRelativeURL } from '~/__tests__/cypress/cypress/utils/url';
33
import { mockModelRegistry } from '~/__mocks__/mockModelRegistry';
4-
import { mockBFFResponse } from '~/__mocks__/utils';
54
import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
65
import { mockModelVersionList } from '~/__mocks__/mockModelVersionList';
76
import { mockModelVersion } from '~/__mocks__/mockModelVersion';
@@ -34,7 +33,7 @@ const initIntercepts = ({
3433
{
3534
path: { apiVersion: MODEL_REGISTRY_API_VERSION },
3635
},
37-
mockBFFResponse(modelRegistries),
36+
modelRegistries,
3837
);
3938

4039
cy.interceptApi(
@@ -46,7 +45,7 @@ const initIntercepts = ({
4645
registeredModelId: 1,
4746
},
4847
},
49-
mockBFFResponse(mockRegisteredModel({})),
48+
mockRegisteredModel({}),
5049
);
5150

5251
cy.interceptApi(
@@ -58,19 +57,17 @@ const initIntercepts = ({
5857
registeredModelId: 1,
5958
},
6059
},
61-
mockBFFResponse(
62-
mockModelVersionList({
63-
items: [
64-
mockModelVersion({ name: 'Version 1', author: 'Author 1', registeredModelId: '1' }),
65-
mockModelVersion({
66-
author: 'Author 2',
67-
registeredModelId: '1',
68-
id: '2',
69-
name: 'Version 2',
70-
}),
71-
],
72-
}),
73-
),
60+
mockModelVersionList({
61+
items: [
62+
mockModelVersion({ name: 'Version 1', author: 'Author 1', registeredModelId: '1' }),
63+
mockModelVersion({
64+
author: 'Author 2',
65+
registeredModelId: '1',
66+
id: '2',
67+
name: 'Version 2',
68+
}),
69+
],
70+
}),
7471
);
7572

7673
cy.interceptApi(
@@ -82,23 +79,21 @@ const initIntercepts = ({
8279
modelVersionId: 1,
8380
},
8481
},
85-
mockBFFResponse(
86-
mockModelVersion({
87-
id: '1',
88-
name: 'Version 1',
89-
labels: [
90-
'Testing label',
91-
'Financial data',
92-
'Fraud detection',
93-
'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc',
94-
'Machine learning',
95-
'Next data to be overflow',
96-
'Label x',
97-
'Label y',
98-
'Label z',
99-
],
100-
}),
101-
),
82+
mockModelVersion({
83+
id: '1',
84+
name: 'Version 1',
85+
labels: [
86+
'Testing label',
87+
'Financial data',
88+
'Fraud detection',
89+
'Long label data to be truncated abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc abc',
90+
'Machine learning',
91+
'Next data to be overflow',
92+
'Label x',
93+
'Label y',
94+
'Label z',
95+
],
96+
}),
10297
);
10398

10499
cy.interceptApi(
@@ -110,7 +105,7 @@ const initIntercepts = ({
110105
modelVersionId: 2,
111106
},
112107
},
113-
mockBFFResponse(mockModelVersion({ id: '2', name: 'Version 2' })),
108+
mockModelVersion({ id: '2', name: 'Version 2' }),
114109
);
115110

116111
cy.interceptApi(
@@ -122,18 +117,16 @@ const initIntercepts = ({
122117
modelVersionId: 1,
123118
},
124119
},
125-
mockBFFResponse(
126-
mockModelArtifactList({
127-
items: [
128-
mockModelArtifact({}),
129-
mockModelArtifact({
130-
author: 'Author 2',
131-
id: '2',
132-
name: 'Artifact 2',
133-
}),
134-
],
135-
}),
136-
),
120+
mockModelArtifactList({
121+
items: [
122+
mockModelArtifact({}),
123+
mockModelArtifact({
124+
author: 'Author 2',
125+
id: '2',
126+
name: 'Artifact 2',
127+
}),
128+
],
129+
}),
137130
);
138131
};
139132

0 commit comments

Comments
 (0)