Skip to content

Commit

Permalink
Fix spacing of headings of integration manager on General settings tab (
Browse files Browse the repository at this point in the history
#10232)

* Fix spacing of headings of integration manager on General settings tab

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* lint

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Check the column gap

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Iterate

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Scroll to 'mx_SetIntegrationManager' and take a snapshot of the dialog

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

* Revert "Scroll to 'mx_SetIntegrationManager' and take a snapshot of the dialog"

This reverts commit 9151d6a.

* Specify actual width of mx_SetIntegrationManager

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>

---------

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
  • Loading branch information
luixxiul committed Apr 5, 2023
1 parent 2434749 commit 7503bf6
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 0 deletions.
60 changes: 60 additions & 0 deletions cypress/e2e/settings/set-integration-manager.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
Copyright 2023 Suguru Hirahara
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

/// <reference types="cypress" />

import { HomeserverInstance } from "../../plugins/utils/homeserver";

const USER_NAME = "Alice";

describe("Set integration manager", () => {
let homeserver: HomeserverInstance;

beforeEach(() => {
cy.startHomeserver("default").then((data) => {
homeserver = data;
cy.initTestUser(homeserver, USER_NAME);
});
});

afterEach(() => {
cy.stopHomeserver(homeserver);
});

it("should be correctly rendered", () => {
cy.openUserSettings("General");

cy.get(".mx_SetIntegrationManager").within(() => {
// Assert the toggle switch is enabled by default
cy.get(".mx_ToggleSwitch_enabled").should("exist");

// Assert space between "Manage integrations" and the integration server address is set to 4px;
cy.get(".mx_SetIntegrationManager_heading_manager").should("have.css", "column-gap", "4px");

cy.get(".mx_SetIntegrationManager_heading_manager").within(() => {
cy.get(".mx_SettingsTab_heading").should("have.text", "Manage integrations");

// Assert the headings' inline end margin values are set to zero in favor of the column-gap declaration
cy.get(".mx_SettingsTab_heading").should("have.css", "margin-inline-end", "0px");
cy.get(".mx_SettingsTab_subheading").should("have.css", "margin-inline-end", "0px");
});
});

cy.get(".mx_SetIntegrationManager").percySnapshotElement("'Manage integrations' on General settings tab", {
widths: [692], // actual width of mx_SetIntegrationManager
});
});
});
1 change: 1 addition & 0 deletions res/css/views/settings/_SetIntegrationManager.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ limitations under the License.
.mx_SettingsTab_subheading {
margin-top: 0;
margin-bottom: 0;
margin-inline-end: 0; /* Cancel the default right (inline-end) margin */
}
}

Expand Down

0 comments on commit 7503bf6

Please sign in to comment.