This repository was archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 812
Fix spacing of headings of integration manager on General settings tab #10232
Merged
andybalaam
merged 12 commits into
matrix-org:develop
from
luixxiul:fix-spacing-SetIntegrationManager
Apr 5, 2023
Merged
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
31a65a6
Fix spacing of headings of integration manager on General settings tab
luixxiul c2c8078
lint
luixxiul 9daa4dc
Check the column gap
luixxiul 86f6403
Merge branch 'develop' into fix-spacing-SetIntegrationManager
luixxiul 4c4d2de
Merge branch 'develop' into fix-spacing-SetIntegrationManager
luixxiul 66073bd
Merge branch 'develop' into fix-spacing-SetIntegrationManager
luixxiul e6b84b1
Iterate
luixxiul b8f3138
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
luixxiul 9151d6a
Scroll to 'mx_SetIntegrationManager' and take a snapshot of the dialog
luixxiul 1647be7
Revert "Scroll to 'mx_SetIntegrationManager' and take a snapshot of t…
luixxiul cb7c783
Specify actual width of mx_SetIntegrationManager
luixxiul ea41ebf
Merge branch 'develop' into fix-spacing-SetIntegrationManager
luixxiul File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| 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 on General settings tab", () => { | ||
| let homeserver: HomeserverInstance; | ||
|
|
||
| beforeEach(() => { | ||
| cy.startHomeserver("default").then((data) => { | ||
| homeserver = data; | ||
| cy.initTestUser(homeserver, USER_NAME); | ||
| }); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| cy.stopHomeserver(homeserver); | ||
| }); | ||
|
|
||
| it("should set integration manager", () => { | ||
| cy.openUserSettings("General"); | ||
| cy.contains("Manage integrations").should("exist"); | ||
|
|
||
| // Make sure integration manager's toggle switch is enabled | ||
| cy.get(".mx_SetIntegrationManager .mx_ToggleSwitch_enabled").should("exist"); | ||
|
|
||
| // Check the default margin set to mx_SettingsTab_heading on the settings tab | ||
| cy.get(".mx_SettingsTab > .mx_SettingsTab_heading").should("have.css", "margin-right", "100px"); | ||
|
|
||
| // Make sure the space between "Manage integrations" and the integration server address is set to 4px; | ||
| cy.get(".mx_SettingsTab .mx_SetIntegrationManager_heading_manager > .mx_SettingsTab_heading").should( | ||
| "have.css", | ||
| "margin-inline-end", | ||
| "0px", | ||
| ); | ||
| cy.get(".mx_SettingsTab .mx_SetIntegrationManager_heading_manager > .mx_SettingsTab_subheading").should( | ||
| "have.css", | ||
| "margin-inline-end", | ||
| "0px", | ||
| ); | ||
| cy.get(".mx_SettingsTab .mx_SetIntegrationManager_heading_manager").should("have.css", "column-gap", "4px"); | ||
|
|
||
| cy.get(".mx_SettingsTab .mx_SetIntegrationManager_heading_manager").percySnapshotElement( | ||
| "'Manage integrations' on General settings tab", | ||
| ); | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.