Skip to content

Commit bb9bad2

Browse files
authored
Remove Prob (#321)
1 parent edce4db commit bb9bad2

30 files changed

+111
-606
lines changed

frontend/jupyter/cypress/e2e/form-page.cy.ts

-35
Original file line numberDiff line numberDiff line change
@@ -412,21 +412,6 @@ describe('New notebook form', () => {
412412
.find('[data-cy-form-input="existing-volume"]')
413413
.find('mat-select')
414414
.click({ force: true });
415-
cy.get('mat-option').contains('test-pro-b-volume').click({ force: true });
416-
cy.get('[data-cy-form-input="workspaceVolume"]')
417-
.find('[data-cy-form-input="existing-volume"]')
418-
.should('have.class', 'ng-invalid');
419-
cy.get('[data-cy-form-input="workspaceVolume"]')
420-
.find('[data-cy-form-input="existing-volume"]')
421-
.find('mat-error')
422-
.should(
423-
'have.text',
424-
' Notebook is unclassified but volume is protected B ',
425-
);
426-
cy.get('[data-cy-form-input="prob"]').click();
427-
cy.get('[data-cy-form-input="workspaceVolume"]')
428-
.find('[data-cy-form-input="existing-volume"]')
429-
.should('have.class', 'ng-valid');
430415
});
431416

432417
it('workspace volume auto update name', () => {
@@ -596,9 +581,6 @@ describe('New notebook form', () => {
596581
.find('mat-select')
597582
.click({ force: true });
598583
cy.get('body').click();
599-
cy.get('[data-cy-form-input="dataVolumes"]')
600-
.find('[data-cy-form-input="existing-volume"]')
601-
.should('have.class', 'ng-invalid');
602584
cy.get('[data-cy-form-input="dataVolumes"]')
603585
.find('[data-cy-form-input="existing-volume"]')
604586
.find('mat-error')
@@ -629,23 +611,6 @@ describe('New notebook form', () => {
629611
.find('[data-cy-form-input="existing-volume"]')
630612
.find('mat-select')
631613
.click({ force: true });
632-
cy.get('[role="listbox"] > mat-option')
633-
.contains('test-pro-b-volume')
634-
.click({ force: true });
635-
cy.get('[data-cy-form-input="dataVolumes"]')
636-
.find('[data-cy-form-input="existing-volume"]')
637-
.should('have.class', 'ng-invalid');
638-
cy.get('[data-cy-form-input="dataVolumes"]')
639-
.find('[data-cy-form-input="existing-volume"]')
640-
.find('mat-error')
641-
.should(
642-
'have.text',
643-
' Notebook is unclassified but volume is protected B ',
644-
);
645-
cy.get('[data-cy-form-input="prob"]').click();
646-
cy.get('[data-cy-form-input="dataVolumes"]')
647-
.find('[data-cy-form-input="existing-volume"]')
648-
.should('have.class', 'ng-valid');
649614
});
650615

651616
it('data volume auto update name', () => {

frontend/jupyter/cypress/e2e/main-page.cy.ts

-20
Original file line numberDiff line numberDiff line change
@@ -204,16 +204,6 @@ describe('Main tables', () => {
204204
.should('eq', 200);
205205
});
206206

207-
it('should have protected B icon on protected B notebook', () => {
208-
cy.get('[data-cy-table-id="notebooks-table"]')
209-
.find(`[data-cy-resource-table-row="Name"]`)
210-
.contains('test-pro-b')
211-
.parent()
212-
.parent()
213-
.find('app-protb-icon')
214-
.should('exist');
215-
});
216-
217207
it('should filter the notebook table', () => {
218208
// filter on notebook name
219209
cy.get('[data-cy-table-filter-id="notebooks-table"]').click();
@@ -373,16 +363,6 @@ describe('Main tables', () => {
373363
cy.wait('@mockDeleteVolume').its('response.statusCode').should('eq', 200);
374364
});
375365

376-
it('should have protected B icon on protected B volume', () => {
377-
cy.get('[data-cy-table-id="volumes-table"]')
378-
.find(`[data-cy-resource-table-row="Name"]`)
379-
.contains('test-pro-b-volume')
380-
.parent()
381-
.parent()
382-
.find('app-protb-icon')
383-
.should('exist');
384-
});
385-
386366
it('should filter the volume table', () => {
387367
// filter on volume name
388368
cy.get('[data-cy-table-filter-id="volumes-table"]').click();

frontend/jupyter/cypress/fixtures/notebooks.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,8 @@
157157
"phase": "ready",
158158
"state": ""
159159
},
160-
"volumes":[
161-
"protb-nb"
162-
],
163160
"labels":{
164-
"data.statcan.gc.ca/inject-blob-volumes":"true",
165-
"notebook.statcan.gc.ca/protected-b":"true"
161+
"data.statcan.gc.ca/inject-blob-volumes":"true"
166162
}
167163
}
168164
],

frontend/jupyter/cypress/fixtures/podDefaults.json

-19
This file was deleted.

frontend/jupyter/cypress/fixtures/pvcs.json

-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
"test-pro-b"
111111
],
112112
"labels":{
113-
"data.statcan.gc.ca/classification":"protected-b"
114113
}
115114
},
116115
{

frontend/jupyter/cypress/support/commands.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Cypress.Commands.add('mockConfigRequest', () => {
9090

9191
Cypress.Commands.add('mockPoddefaultsRequest', namespace => {
9292
cy.intercept('GET', `/api/namespaces/${namespace}/poddefaults`, {
93-
fixture: 'podDefaults',
93+
fixture: 'poddefaults',
9494
}).as('mockPoddefaultsRequest');
9595
});
9696

0 commit comments

Comments
 (0)