OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix spacing of headings of integration manager on General settings tab (#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 9151d6a34de109c0dffa95046397c13f4b61f5a4.

* 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>
pull/28217/head
Suguru Hirahara 2023-04-05 07:13:32 +00:00 committed by GitHub
parent 2434749f65
commit 7503bf6b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cypress/e2e/settings/set-integration-manager.spec.ts Normal file
View File

@ -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
res/css/views/settings/_SetIntegrationManager.pcss
View File

@ -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 */
}
}