Skip to content

Commit e9f6262

Browse files
leaftyleafty
committed
wip 😕
1 parent 3dd6655 commit e9f6262

File tree

2 files changed

+87
-81
lines changed

2 files changed

+87
-81
lines changed

‎tests/cypress/e2e/projectV2Session.spec.ts‎

Lines changed: 86 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ describe("launch sessions with cloud storage", () => {
184184
cy.url().should("match", /\/projects\/.*\/sessions\/.*\/start$/);
185185
});
186186

187-
it("launch session with data source, saving credentials", () => {
187+
it.only("launch session with data source, saving credentials", () => {
188188
fixtures
189189
.testCloudStorage()
190190
.cloudStorage({
@@ -224,15 +224,15 @@ describe("launch sessions with cloud storage", () => {
224224
// The following two lines are for when the credentials are not in the config, but
225225
// this causes problems, allow them to be there for now
226226
// See also projectCloudStorage.utils.ts:storageDefinitionAfterSavingCredentialsFromConfig
227-
// expect(storage.configuration).to.not.have.property("access_key_id");
228-
// expect(storage.configuration).to.not.have.property("secret_access_key");
227+
expect(storage.configuration).to.not.have.property("access_key_id");
228+
expect(storage.configuration).to.not.have.property("secret_access_key");
229229

230-
expect(storage.configuration).to.have.property("access_key_id");
231-
expect(storage.configuration).to.have.property("secret_access_key");
232-
expect(storage.configuration["access_key_id"]).to.equal("access key");
233-
expect(storage.configuration["secret_access_key"]).to.equal(
234-
"secret key"
235-
);
230+
// expect(storage.configuration).to.have.property("access_key_id");
231+
// expect(storage.configuration).to.have.property("secret_access_key");
232+
// expect(storage.configuration["access_key_id"]).to.equal("access key");
233+
// expect(storage.configuration["secret_access_key"]).to.equal(
234+
// "secret key"
235+
// );
236236
req.reply({ body: sessions[0] });
237237
}).as("createSession");
238238
});
@@ -269,7 +269,13 @@ describe("launch sessions with cloud storage", () => {
269269
.click();
270270
cy.wait("@testCloudStorage");
271271
cy.contains("Saving credentials...").should("be.visible");
272-
cy.wait("@postCloudStorageSecrets");
272+
cy.wait("@postCloudStorageSecrets").then(() => {
273+
fixtures.cloudStorage({
274+
isV2: true,
275+
fixture: "cloudStorage/cloud-storage-with-secrets-values-full.json",
276+
name: "getCloudStorageV2WithSecrets",
277+
});
278+
});
273279
cy.wait("@createSession");
274280
cy.url().should("match", /\/projects\/.*\/sessions\/.*\/start$/);
275281
});
@@ -391,76 +397,76 @@ describe("launch sessions with cloud storage", () => {
391397
cy.url().should("match", /\/projects\/.*\/sessions\/.*\/start$/);
392398
});
393399

394-
it("launch session with incomplete saved credentials", () => {
395-
fixtures
396-
.testCloudStorage()
397-
.cloudStorage({
398-
isV2: true,
399-
fixture: "cloudStorage/cloud-storage-with-secrets-values-partial.json",
400-
name: "getCloudStorageV2",
401-
})
402-
.cloudStorageSecrets({
403-
fixture: "cloudStorage/cloud-storage-secrets-partial.json",
404-
});
405-
406-
cy.visit("/v2/projects/user1-uuid/test-2-v2-project");
407-
cy.wait("@readProjectV2");
408-
cy.wait("@getSessionServers");
409-
cy.wait("@sessionLaunchers");
410-
411-
// start session
412-
fixtures.postCloudStorageSecrets({
413-
content: [
414-
{
415-
name: "access_key_id",
416-
value: "access key",
417-
},
418-
{
419-
name: "secret_access_key",
420-
value: "secret key",
421-
},
422-
],
423-
});
424-
425-
cy.fixture("sessions/sessionsV2.json").then((sessions) => {
426-
// eslint-disable-next-line max-nested-callbacks
427-
cy.intercept("POST", "/ui-server/api/notebooks/v2/servers", (req) => {
428-
const csConfig = req.body.cloudstorage;
429-
expect(csConfig.length).equal(1);
430-
const storage = csConfig[0];
431-
expect(storage.storage_id).to.equal("2");
432-
expect(storage.configuration).to.have.property("access_key_id");
433-
expect(storage.configuration).to.have.property("secret_access_key");
434-
expect(storage.configuration["access_key_id"]).to.equal("access key");
435-
expect(storage.configuration["secret_access_key"]).to.equal(
436-
"secret key"
437-
);
438-
req.reply({ body: sessions[0] });
439-
}).as("createSession");
440-
});
441-
442-
fixtures.getSessions({ fixture: "sessions/sessionsV2.json" });
443-
cy.getDataCy("session-launcher-item")
444-
.first()
445-
.within(() => {
446-
cy.getDataCy("start-session-button").click();
447-
});
448-
cy.getDataCy("session-cloud-storage-credentials-modal")
449-
.find("#access_key_id")
450-
.type("access key");
451-
cy.getDataCy("session-cloud-storage-credentials-modal")
452-
.contains("Secret Access Key (password)")
453-
.should("be.visible");
454-
cy.getDataCy("session-cloud-storage-credentials-modal")
455-
.find("#secret_access_key")
456-
.type("secret key");
457-
cy.getDataCy("session-cloud-storage-credentials-modal")
458-
.contains("Continue")
459-
.click();
460-
cy.wait("@testCloudStorage");
461-
cy.wait("@createSession");
462-
cy.url().should("match", /\/projects\/.*\/sessions\/.*\/start$/);
463-
});
400+
// it("launch session with incomplete saved credentials", () => {
401+
// fixtures
402+
// .testCloudStorage()
403+
// .cloudStorage({
404+
// isV2: true,
405+
// fixture: "cloudStorage/cloud-storage-with-secrets-values-partial.json",
406+
// name: "getCloudStorageV2",
407+
// })
408+
// .cloudStorageSecrets({
409+
// fixture: "cloudStorage/cloud-storage-secrets-partial.json",
410+
// });
411+
412+
// cy.visit("/v2/projects/user1-uuid/test-2-v2-project");
413+
// cy.wait("@readProjectV2");
414+
// cy.wait("@getSessionServers");
415+
// cy.wait("@sessionLaunchers");
416+
417+
// // start session
418+
// fixtures.postCloudStorageSecrets({
419+
// content: [
420+
// {
421+
// name: "access_key_id",
422+
// value: "access key",
423+
// },
424+
// {
425+
// name: "secret_access_key",
426+
// value: "secret key",
427+
// },
428+
// ],
429+
// });
430+
431+
// cy.fixture("sessions/sessionsV2.json").then((sessions) => {
432+
// // eslint-disable-next-line max-nested-callbacks
433+
// cy.intercept("POST", "/ui-server/api/notebooks/v2/servers", (req) => {
434+
// const csConfig = req.body.cloudstorage;
435+
// expect(csConfig.length).equal(1);
436+
// const storage = csConfig[0];
437+
// expect(storage.storage_id).to.equal("2");
438+
// expect(storage.configuration).to.have.property("access_key_id");
439+
// expect(storage.configuration).to.have.property("secret_access_key");
440+
// expect(storage.configuration["access_key_id"]).to.equal("access key");
441+
// expect(storage.configuration["secret_access_key"]).to.equal(
442+
// "secret key"
443+
// );
444+
// req.reply({ body: sessions[0] });
445+
// }).as("createSession");
446+
// });
447+
448+
// fixtures.getSessions({ fixture: "sessions/sessionsV2.json" });
449+
// cy.getDataCy("session-launcher-item")
450+
// .first()
451+
// .within(() => {
452+
// cy.getDataCy("start-session-button").click();
453+
// });
454+
// cy.getDataCy("session-cloud-storage-credentials-modal")
455+
// .find("#access_key_id")
456+
// .type("access key");
457+
// cy.getDataCy("session-cloud-storage-credentials-modal")
458+
// .contains("Secret Access Key (password)")
459+
// .should("be.visible");
460+
// cy.getDataCy("session-cloud-storage-credentials-modal")
461+
// .find("#secret_access_key")
462+
// .type("secret key");
463+
// cy.getDataCy("session-cloud-storage-credentials-modal")
464+
// .contains("Continue")
465+
// .click();
466+
// cy.wait("@testCloudStorage");
467+
// cy.wait("@createSession");
468+
// cy.url().should("match", /\/projects\/.*\/sessions\/.*\/start$/);
469+
// });
464470

465471
it("launch session with data source requiring multiple credentials", () => {
466472
fixtures.cloudStorage({

‎tests/cypress/support/renkulab-fixtures/cloudStorage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export function CloudStorage<T extends FixturesConstructor>(Parent: T) {
125125
if (shouldNotBeCalled)
126126
throw new Error("No call to post secrets expected");
127127
const newSecrets = req.body;
128-
expect(newSecrets.length).equal(content.length);
128+
expect(newSecrets).to.have.length(content.length);
129129
newSecrets.forEach((secret, index) => {
130130
expect(secret.name).equal(content[index].name);
131131
expect(secret.value).equal(content[index].value);

0 commit comments

Comments
 (0)