diff --git a/client/src/features/dashboardV2/DashboardV2.tsx b/client/src/features/dashboardV2/DashboardV2.tsx index 3f840b702..db762c273 100644 --- a/client/src/features/dashboardV2/DashboardV2.tsx +++ b/client/src/features/dashboardV2/DashboardV2.tsx @@ -616,7 +616,7 @@ function SessionsDashboard() {

- My Sessions + My sessions

{totalSessions}
diff --git a/client/src/features/projectsV2/show/ProjectShortHandDisplay.tsx b/client/src/features/projectsV2/show/ProjectShortHandDisplay.tsx index 2ab8d5a2b..4057b8f9a 100644 --- a/client/src/features/projectsV2/show/ProjectShortHandDisplay.tsx +++ b/client/src/features/projectsV2/show/ProjectShortHandDisplay.tsx @@ -41,20 +41,34 @@ export default function ProjectShortHandDisplay({ )} data-cy="project-item" > -
+

{project.name}

-
+

{project.description}

{project.updated_at ? ( { }); it("view dashboard", () => { - cy.contains("Sessions").should("be.visible"); - cy.contains("Projects").should("be.visible"); - cy.contains("Groups").should("be.visible"); + cy.contains("My sessions").should("be.visible"); + cy.contains("My projects").should("be.visible"); + cy.contains("My groups").should("be.visible"); }); it("view sessions", () => { - cy.contains("Sessions").should("be.visible"); + cy.contains("My sessions").should("be.visible"); cy.getDataCy("dashboard-session-list") .find("[data-cy=dashboard-session-list-item]") - .contains("user1-uuid/test-2-v2-project") + .contains("THEPROJECTULID26CHARACTERS") .should("be.visible"); cy.getDataCy("dashboard-session-list") .find("[data-cy=dashboard-session-list-item]") @@ -57,7 +57,7 @@ describe("View v2 landing page", () => { }); it("view projects", () => { - cy.contains("Projects").should("be.visible"); + cy.contains("My projects").should("be.visible"); cy.getDataCy("dashboard-project-list").children().should("have.length", 5); cy.getDataCy("dashboard-project-list").children().first().click(); cy.location("pathname").should( @@ -67,7 +67,7 @@ describe("View v2 landing page", () => { }); it("view groups", () => { - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.getDataCy("dashboard-group-list").children().should("have.length", 5); cy.getDataCy("group-item").first().click(); cy.location("pathname").should("contain", "/v2/groups/test-0-group-v2"); @@ -75,7 +75,7 @@ describe("View v2 landing page", () => { it("list groups", () => { cy.contains("View other groups").should("not.exist"); - cy.contains("View all my groups").should("be.visible").click(); + cy.contains("View all my 50 groups").should("be.visible").click(); cy.contains("Renku 2.0 Search").should("be.visible"); cy.getDataCy("search-filter-role-owner").should("be.checked"); cy.getDataCy("search-filter-role-editor").should("be.checked"); @@ -85,7 +85,7 @@ describe("View v2 landing page", () => { it("list projects", () => { cy.contains("View other projects").should("not.exist"); - cy.contains("View all my projects").should("be.visible").click(); + cy.contains("View all my 50 projects").should("be.visible").click(); cy.contains("Renku 2.0 Search").should("be.visible"); cy.getDataCy("search-filter-role-owner").should("be.checked"); cy.getDataCy("search-filter-role-editor").should("be.checked"); diff --git a/tests/cypress/e2e/groupV2.spec.ts b/tests/cypress/e2e/groupV2.spec.ts index b7bd8cf9e..d98ae4c3d 100644 --- a/tests/cypress/e2e/groupV2.spec.ts +++ b/tests/cypress/e2e/groupV2.spec.ts @@ -66,7 +66,7 @@ describe("List v2 groups", () => { }); it("list groups", () => { - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 1 group-v2").should("exist"); cy.getDataCy("dashboard-group-list") .find("a") @@ -76,7 +76,7 @@ describe("List v2 groups", () => { it("shows groups", () => { fixtures.readGroupV2().readGroupV2Namespace(); - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 2 group-v2").should("be.visible").click(); cy.wait("@readGroupV2"); cy.contains("test 2 group-v2").should("be.visible"); @@ -104,7 +104,7 @@ describe("Edit v2 group", () => { .listGroupV2Members() .listProjectV2ByNamespace() .listDataConnectors({ namespace: "test-2-group-v2" }); - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 2 group-v2").should("be.visible").click(); cy.wait("@readGroupV2"); cy.contains("test 2 group-v2").should("be.visible"); @@ -118,7 +118,7 @@ describe("Edit v2 group", () => { .getGroupV2Permissions() .listGroupV2Members() .updateGroupV2(); - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 2 group-v2").should("be.visible").click(); cy.wait("@readGroupV2"); cy.contains("test 2 group-v2").should("be.visible"); @@ -155,7 +155,7 @@ describe("Edit v2 group", () => { .readGroupV2() .readGroupV2Namespace(); - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 2 group-v2").should("be.visible").click(); cy.wait("@readGroupV2"); cy.contains("test 2 group-v2").should("be.visible"); @@ -202,7 +202,7 @@ describe("Edit v2 group", () => { .getGroupV2Permissions() .listGroupV2Members() .deleteGroupV2(); - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 2 group-v2").should("be.visible").click(); cy.wait("@readGroupV2"); cy.contains("test 2 group-v2").should("be.visible"); @@ -266,7 +266,7 @@ describe("Work with group data connectors", () => { .readProjectV2ById({ projectId: "PROJECT-ULID-1", name: "readProject1" }) .readProjectV2ById({ projectId: "PROJECT-ULID-2", name: "readProject2" }) .readProjectV2ById({ projectId: "PROJECT-ULID-3", name: "readProject2" }); - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 2 group-v2").should("be.visible").click(); cy.wait("@readGroupV2"); cy.contains("test 2 group-v2").should("be.visible"); @@ -406,7 +406,7 @@ describe("Work with group data connectors, missing permissions", () => { .readProjectV2ById({ projectId: "PROJECT-ULID-1", name: "readProject1" }) .readProjectV2ById({ projectId: "PROJECT-ULID-2", name: "readProject2" }) .readProjectV2ById({ projectId: "PROJECT-ULID-3", name: "readProject2" }); - cy.contains("Groups").should("be.visible"); + cy.contains("My groups").should("be.visible"); cy.contains("test 2 group-v2").should("be.visible").click(); cy.wait("@readGroupV2"); cy.contains("test 2 group-v2").should("be.visible"); diff --git a/tests/cypress/e2e/projectV2.spec.ts b/tests/cypress/e2e/projectV2.spec.ts index 0597d85dd..3e56c871f 100644 --- a/tests/cypress/e2e/projectV2.spec.ts +++ b/tests/cypress/e2e/projectV2.spec.ts @@ -203,7 +203,7 @@ describe("Edit v2 project", () => { it("changes project metadata", () => { fixtures.readProjectV2().updateProjectV2().listNamespaceV2(); - cy.contains("Projects").should("be.visible"); + cy.contains("My projects").should("be.visible"); cy.getDataCy("dashboard-project-list") .contains("a", "test 2 v2-project") .should("be.visible") @@ -438,7 +438,7 @@ describe("Edit v2 project", () => { fixture: "projectV2/list-projectV2-post-delete.json", name: "listProjectV2PostDelete", }); - cy.contains("Projects"); + cy.contains("My projects"); cy.contains("Project deleted").should("be.visible"); }); });