From b8e39babf9d95e08ad5ee23ca570eb56ccee3dd7 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 13 Jul 2022 17:30:55 +0900 Subject: [PATCH 01/12] Apply inline start padding of selected line to modern layout only Signed-off-by: Suguru Hirahara --- res/css/views/rooms/_EventTile.pcss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss index 1e48abb62f1..f5e93c25599 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -420,6 +420,10 @@ $left-gutter: 64px; top: 0; } } + + &.mx_EventTile_selected .mx_EventTile_line { + padding-left: calc($left-gutter + 18px); + } } &:hover { @@ -462,10 +466,6 @@ $left-gutter: 64px; padding-top: 18px; font-size: $font-14px; position: relative; - - &.mx_EventTile_selected.mx_EventTile_info .mx_EventTile_line { - padding-left: calc($left-gutter + 18px); - } } .mx_GenericEventListSummary { From 94369d0c953e8d4fe645120fd12e335c8df27e09 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 14 Jul 2022 12:15:45 +0900 Subject: [PATCH 02/12] Add a test Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 34 ++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index e941e6920e7..b490d0dd039 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -167,5 +167,39 @@ describe("Timeline", () => { // Make sure "collapse" link button worked cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]"); }); + + it("should select a hidden event line on IRC layout", () => { + cy.setSettingValue("useOnlyCurrentProfiles", null, SettingLevel.ACCOUNT, false); + + // Enable hidden events and IRC layout + cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true); + cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC); + + cy.visit("/#/room/" + roomId); + + // Wait until configuration is finished + cy.get(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=irc] .mx_GenericEventListSummary_summary") + .should("contain", "created and configured the room."); + + // User sends message + cy.get(".mx_RoomView_body .mx_BasicMessageComposer_input").type("Hello{enter}"); + + // Wait for message to send + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "Hello") + + // Edit message + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello").within(() => { + cy.get('[aria-label="Edit"]').click({ force: true }); // Cypress has no ability to hover + cy.get(".mx_BasicMessageComposer_input").type(" Edit{enter}"); + }); + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello Edit") + + // Click timestamp to select the hidden event line + cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); + + // Exclude timestamp from snapshot + const percyCSS = ".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp { visibility: hidden !important; }"; + cy.percySnapshot("Hidden event on IRC layout", { percyCSS }); + }); }); }); From b05de8b03ccea92a8836fae2c42c72fb0fcbf918 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 14 Jul 2022 15:52:05 +0900 Subject: [PATCH 03/12] yarn run lint Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index b490d0dd039..b9e76a64536 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -185,20 +185,21 @@ describe("Timeline", () => { cy.get(".mx_RoomView_body .mx_BasicMessageComposer_input").type("Hello{enter}"); // Wait for message to send - cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "Hello") + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "Hello"); // Edit message cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello").within(() => { cy.get('[aria-label="Edit"]').click({ force: true }); // Cypress has no ability to hover cy.get(".mx_BasicMessageComposer_input").type(" Edit{enter}"); }); - cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello Edit") + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello Edit"); // Click timestamp to select the hidden event line cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); // Exclude timestamp from snapshot - const percyCSS = ".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp { visibility: hidden !important; }"; + const percyCSS = ".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp " + + "{ visibility: hidden !important; }"; cy.percySnapshot("Hidden event on IRC layout", { percyCSS }); }); }); From d6c16ff23eef95186c117b7ddb2bb419b62576f8 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 15 Jul 2022 00:39:20 +0900 Subject: [PATCH 04/12] Try to address reviews Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 27 +++++++++--------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index b9e76a64536..bf4604eb10c 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -168,20 +168,12 @@ describe("Timeline", () => { cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]"); }); - it("should select a hidden event line on IRC layout", () => { - cy.setSettingValue("useOnlyCurrentProfiles", null, SettingLevel.ACCOUNT, false); - - // Enable hidden events and IRC layout + it("should not add inline start padding to a hidden event line on IRC layout", () => { + cy.visit("/#/room/" + roomId); cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true); cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC); - - cy.visit("/#/room/" + roomId); - - // Wait until configuration is finished - cy.get(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=irc] .mx_GenericEventListSummary_summary") - .should("contain", "created and configured the room."); - - // User sends message + cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=irc] " + + ".mx_GenericEventListSummary_summary", "created and configured the room."); cy.get(".mx_RoomView_body .mx_BasicMessageComposer_input").type("Hello{enter}"); // Wait for message to send @@ -190,17 +182,18 @@ describe("Timeline", () => { // Edit message cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello").within(() => { cy.get('[aria-label="Edit"]').click({ force: true }); // Cypress has no ability to hover - cy.get(".mx_BasicMessageComposer_input").type(" Edit{enter}"); + cy.get(".mx_BasicMessageComposer_input").type("Edit{enter}"); }); - cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello Edit"); - // Click timestamp to select the hidden event line + // Check inline start padding of the hidden event line cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); + cy.get(".mx_EventTile[data-layout=irc].mx_EventTile_info .mx_EventTile_line") + .should('have.css', 'padding-inline-start', '0px'); // Exclude timestamp from snapshot - const percyCSS = ".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp " + const percyCSS = ".mx_RoomView_body.mx_EventTile[data-layout=irc] .mx_MessageTimestamp " + "{ visibility: hidden !important; }"; - cy.percySnapshot("Hidden event on IRC layout", { percyCSS }); + cy.percySnapshot("Hidden event line with zero padding on IRC layout", { percyCSS }); }); }); }); From 8b13ce520eb6a8c323d8067c933db741f4458cce Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 17 Jul 2022 00:27:41 +0900 Subject: [PATCH 05/12] Organize tests in layouts Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 39 +++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index bf4604eb10c..a3e35e4d5a6 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -143,6 +143,8 @@ describe("Timeline", () => { }); }); + // Tests for IRC layout + it("should create and configure a room on IRC layout", () => { cy.visit("/#/room/" + roomId); cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC); @@ -151,23 +153,6 @@ describe("Timeline", () => { cy.percySnapshot("Configured room on IRC layout"); }); - it("should click 'collapse' link button on the first hovered info event line on bubble layout", () => { - cy.visit("/#/room/" + roomId); - cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.Bubble); - cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=bubble] " + - ".mx_GenericEventListSummary_summary", "created and configured the room."); - - // Click "expand" link button - cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]").click(); - - // Click "collapse" link button on the first hovered info event line - cy.get(".mx_GenericEventListSummary_unstyledList .mx_EventTile_info:first-of-type").realHover() - .get(".mx_GenericEventListSummary_toggle[aria-expanded=true]").click({ force: false }); - - // Make sure "collapse" link button worked - cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]"); - }); - it("should not add inline start padding to a hidden event line on IRC layout", () => { cy.visit("/#/room/" + roomId); cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true); @@ -195,5 +180,25 @@ describe("Timeline", () => { + "{ visibility: hidden !important; }"; cy.percySnapshot("Hidden event line with zero padding on IRC layout", { percyCSS }); }); + + // Tests for bubble message layout + + it("should click 'collapse' link button on the first hovered info event line on bubble layout", () => { + cy.visit("/#/room/" + roomId); + cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.Bubble); + cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=bubble] " + + ".mx_GenericEventListSummary_summary", "created and configured the room."); + + // Click "expand" link button + cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]").click(); + + // Click "collapse" link button on the first hovered info event line + cy.get(".mx_GenericEventListSummary_unstyledList .mx_EventTile_info:first-of-type").realHover() + .get(".mx_GenericEventListSummary_toggle[aria-expanded=true]").click({ force: false }); + + // Make sure "collapse" link button worked + cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]"); + }); + }); }); From 11bf76639bec9e22005ffc46679b7fcf57acaab7 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 17 Jul 2022 01:20:25 +0900 Subject: [PATCH 06/12] Remove a line Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index a3e35e4d5a6..35fb5bf9ed4 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -199,6 +199,5 @@ describe("Timeline", () => { // Make sure "collapse" link button worked cy.get(".mx_GenericEventListSummary_toggle[aria-expanded=false]"); }); - }); }); From 5bbd3d87dfd82638df03c82409cde37921712faa Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 17 Jul 2022 02:39:10 +0900 Subject: [PATCH 07/12] Add a test for modern=group layout, fixing an inconsistent inline start padding setting Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 31 ++++++++++++++++++++++++ res/css/views/rooms/_EventTile.pcss | 6 +++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index 35fb5bf9ed4..5a6c9d6ff53 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -181,6 +181,37 @@ describe("Timeline", () => { cy.percySnapshot("Hidden event line with zero padding on IRC layout", { percyCSS }); }); + // Tests for modern=group layout + + it("should add inline start padding to a hidden event line on modern=group layout", () => { + cy.visit("/#/room/" + roomId); + cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true); + cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.Group); + cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=group] " + + ".mx_GenericEventListSummary_summary", "created and configured the room."); + cy.get(".mx_RoomView_body .mx_BasicMessageComposer_input").type("Hello{enter}"); + + // Wait for message to send + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "Hello"); + + // Edit message + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello").within(() => { + cy.get('[aria-label="Edit"]').click({ force: true }); // Cypress has no ability to hover + cy.get(".mx_BasicMessageComposer_input").type("Edit{enter}"); + }); + + // Check inline start padding of the hidden event line + cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); + cy.get(".mx_EventTile[data-layout=group].mx_EventTile_info .mx_EventTile_line") + // calc(var(--EventTile_group_line-spacing-inline-start) + 20px) = 64 + 20 = 84px + .should('have.css', 'padding-inline-start', '84px'); + + // Exclude timestamp from snapshot + const percyCSS = ".mx_RoomView_body.mx_EventTile[data-layout=group] .mx_MessageTimestamp " + + "{ visibility: hidden !important; }"; + cy.percySnapshot("Hidden event line with padding on modern=group layout", { percyCSS }); + }); + // Tests for bubble message layout it("should click 'collapse' link button on the first hovered info event line on bubble layout", () => { diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss index f5e93c25599..57daaa0d86c 100644 --- a/res/css/views/rooms/_EventTile.pcss +++ b/res/css/views/rooms/_EventTile.pcss @@ -422,7 +422,8 @@ $left-gutter: 64px; } &.mx_EventTile_selected .mx_EventTile_line { - padding-left: calc($left-gutter + 18px); + // TODO: check if this would be necessary + padding-inline-start: calc(var(--EventTile_group_line-spacing-inline-start) + 20px); } } @@ -500,7 +501,8 @@ $left-gutter: 64px; } .mx_GenericEventListSummary_unstyledList > .mx_EventTile_info .mx_EventTile_avatar ~ .mx_EventTile_line { - padding-left: calc($left-gutter + 20px); // override padding-left $left-gutter + // override padding-left $left-gutter + padding-inline-start: calc(var(--EventTile_group_line-spacing-inline-start) + 20px); } } } From 267b8f8280747c776d0898328e7e63575f8aa9aa Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 23 Jul 2022 00:32:02 +0900 Subject: [PATCH 08/12] Merge tests Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 56 ++++++------------------ 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index 5a6c9d6ff53..62e4ebea83c 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -143,8 +143,6 @@ describe("Timeline", () => { }); }); - // Tests for IRC layout - it("should create and configure a room on IRC layout", () => { cy.visit("/#/room/" + roomId); cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC); @@ -153,67 +151,41 @@ describe("Timeline", () => { cy.percySnapshot("Configured room on IRC layout"); }); - it("should not add inline start padding to a hidden event line on IRC layout", () => { + it("should set inline start padding to a hidden event line", () => { + sendEvent(roomId); cy.visit("/#/room/" + roomId); cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true); - cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC); - cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=irc] " + - ".mx_GenericEventListSummary_summary", "created and configured the room."); - cy.get(".mx_RoomView_body .mx_BasicMessageComposer_input").type("Hello{enter}"); - - // Wait for message to send - cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "Hello"); + cy.contains(".mx_RoomView_body .mx_GenericEventListSummary .mx_GenericEventListSummary_summary", + "created and configured the room."); // Edit message - cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello").within(() => { + cy.contains(".mx_RoomView_body .mx_EventTile .mx_EventTile_line", "Message").within(() => { cy.get('[aria-label="Edit"]').click({ force: true }); // Cypress has no ability to hover cy.get(".mx_BasicMessageComposer_input").type("Edit{enter}"); }); + cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "MessageEdit"); // Check inline start padding of the hidden event line cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); - cy.get(".mx_EventTile[data-layout=irc].mx_EventTile_info .mx_EventTile_line") - .should('have.css', 'padding-inline-start', '0px'); // Exclude timestamp from snapshot - const percyCSS = ".mx_RoomView_body.mx_EventTile[data-layout=irc] .mx_MessageTimestamp " + const percyCSS = ".mx_RoomView_body.mx_EventTile .mx_MessageTimestamp " + "{ visibility: hidden !important; }"; - cy.percySnapshot("Hidden event line with zero padding on IRC layout", { percyCSS }); - }); - // Tests for modern=group layout + // should not add inline start padding to a hidden event line on IRC layout + cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.IRC); + cy.get(".mx_EventTile[data-layout=irc].mx_EventTile_info .mx_EventTile_line") + .should('have.css', 'padding-inline-start', '0px'); + cy.percySnapshot("Hidden event line with zero padding on IRC layout", { percyCSS }); - it("should add inline start padding to a hidden event line on modern=group layout", () => { - cy.visit("/#/room/" + roomId); - cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true); + // should add inline start padding to a hidden event line on modern layout cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.Group); - cy.contains(".mx_RoomView_body .mx_GenericEventListSummary[data-layout=group] " + - ".mx_GenericEventListSummary_summary", "created and configured the room."); - cy.get(".mx_RoomView_body .mx_BasicMessageComposer_input").type("Hello{enter}"); - - // Wait for message to send - cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "Hello"); - - // Edit message - cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile_line", "Hello").within(() => { - cy.get('[aria-label="Edit"]').click({ force: true }); // Cypress has no ability to hover - cy.get(".mx_BasicMessageComposer_input").type("Edit{enter}"); - }); - - // Check inline start padding of the hidden event line - cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); cy.get(".mx_EventTile[data-layout=group].mx_EventTile_info .mx_EventTile_line") // calc(var(--EventTile_group_line-spacing-inline-start) + 20px) = 64 + 20 = 84px .should('have.css', 'padding-inline-start', '84px'); - - // Exclude timestamp from snapshot - const percyCSS = ".mx_RoomView_body.mx_EventTile[data-layout=group] .mx_MessageTimestamp " - + "{ visibility: hidden !important; }"; - cy.percySnapshot("Hidden event line with padding on modern=group layout", { percyCSS }); + cy.percySnapshot("Hidden event line with padding on modern layout", { percyCSS }); }); - // Tests for bubble message layout - it("should click 'collapse' link button on the first hovered info event line on bubble layout", () => { cy.visit("/#/room/" + roomId); cy.setSettingValue("layout", null, SettingLevel.DEVICE, Layout.Bubble); From 9b143d7a7836a2485381a030a030cfe7962f2e19 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 23 Jul 2022 00:37:20 +0900 Subject: [PATCH 09/12] Fix a line Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index 62e4ebea83c..91d45889ee5 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -169,7 +169,7 @@ describe("Timeline", () => { cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); // Exclude timestamp from snapshot - const percyCSS = ".mx_RoomView_body.mx_EventTile .mx_MessageTimestamp " + const percyCSS = ".mx_RoomView_body .mx_EventTile .mx_MessageTimestamp " + "{ visibility: hidden !important; }"; // should not add inline start padding to a hidden event line on IRC layout From c57d1f0c797bec9a75ba1f6395c1f642afe1ad9a Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 23 Jul 2022 15:54:51 +0900 Subject: [PATCH 10/12] Fix a comment line Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index 91d45889ee5..240d7f4f2f2 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -165,7 +165,7 @@ describe("Timeline", () => { }); cy.get(".mx_RoomView_body .mx_EventTile").contains(".mx_EventTile[data-scroll-tokens]", "MessageEdit"); - // Check inline start padding of the hidden event line + // Click timestamp to highlight hidden event line cy.get(".mx_RoomView_body .mx_EventTile_info .mx_MessageTimestamp").click(); // Exclude timestamp from snapshot From d58b350bd3a881586c0a5cb6c1c968755a3b5106 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 23 Jul 2022 16:12:08 +0900 Subject: [PATCH 11/12] Add an indent Signed-off-by: Suguru Hirahara --- cypress/e2e/14-timeline/timeline.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/14-timeline/timeline.spec.ts b/cypress/e2e/14-timeline/timeline.spec.ts index 92b81c8a1f4..81af2f1c78e 100644 --- a/cypress/e2e/14-timeline/timeline.spec.ts +++ b/cypress/e2e/14-timeline/timeline.spec.ts @@ -191,7 +191,7 @@ describe("Timeline", () => { cy.visit("/#/room/" + roomId); cy.setSettingValue("showHiddenEventsInTimeline", null, SettingLevel.DEVICE, true); cy.contains(".mx_RoomView_body .mx_GenericEventListSummary " + - ".mx_GenericEventListSummary_summary", "created and configured the room."); + ".mx_GenericEventListSummary_summary", "created and configured the room."); // Edit message cy.contains(".mx_RoomView_body .mx_EventTile .mx_EventTile_line", "Message").within(() => { From eabf3012c3fa47f1a51030e97f9c74d70ab38819 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 30 Jul 2022 17:45:45 +0900 Subject: [PATCH 12/12] Empty commit Signed-off-by: Suguru Hirahara