111 remove public private switch #166
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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,68 @@ | ||
| /// <reference types="cypress" /> | ||
|
|
||
| import RoomUtils from "../utils/room-utils"; | ||
| import Chainable = Cypress.Chainable; | ||
|
|
||
|
|
||
|
|
||
| describe("Check room access settings", () => { | ||
| const homeserverUrl = Cypress.env('E2E_TEST_USER_HOMESERVER_URL'); | ||
| const email = Cypress.env('E2E_TEST_USER_EMAIL'); | ||
| const password = Cypress.env('E2E_TEST_USER_PASSWORD'); | ||
| const homeserverShortname = Cypress.env('E2E_TEST_USER_HOMESERVER_SHORT'); | ||
| const today = new Date().toISOString().slice(0, 10).replace(/-/g, ''); | ||
|
|
||
| beforeEach(() => { | ||
| cy.loginUser(homeserverUrl, email, password); | ||
|
There was a problem hiding this comment. J'ai fait une version de cy.loginUser sans arguments, pour eviter d'avoir a specifier les defaults. Dans cette PR : #171 |
||
| }); | ||
|
|
||
| afterEach(() => { | ||
| // todo delete room, otherwise the test user will end up with a million identical rooms after a while. | ||
|
There was a problem hiding this comment. I have a PR to add this : #170 |
||
| }); | ||
|
|
||
| it("creates a public room and check access settings", () => { | ||
| const roomName = "test/"+today+"/public_room_check_access_settings"; | ||
|
|
||
| RoomUtils.createPublicRoom(roomName); | ||
|
|
||
| openRoomAccessSettings(); | ||
|
|
||
| //assert | ||
| cy.get('#joinRule-invite-description').should('not.exist'); | ||
| cy.get('#joinRule-restricted-description').should('not.exist'); | ||
| cy.get('#joinRule-public-description').should('exist'); | ||
| }); | ||
|
|
||
| it("creates a private room and check access settings", () => { | ||
| const roomName = "test/"+today+"/private_room_check_access_settings"; | ||
|
|
||
| RoomUtils.createPrivateRoom(roomName); | ||
|
|
||
| openRoomAccessSettings(); | ||
|
|
||
| //assert | ||
| cy.get('#joinRule-invite-description').should('exist'); | ||
| cy.get('#joinRule-restricted-description').should('not.exist'); | ||
| cy.get('#joinRule-public-description').should('not.exist'); | ||
| }); | ||
|
|
||
| it("creates a private room with external and check access settings", () => { | ||
| const roomName = "test/"+today+"/private_room_check_access_settings"; | ||
|
|
||
| RoomUtils.createPrivateRoomWithExternal(roomName); | ||
|
|
||
| openRoomAccessSettings(); | ||
|
|
||
| //assert | ||
| cy.get('#joinRule-invite-description').should('exist'); | ||
| cy.get('#joinRule-restricted-description').should('not.exist'); | ||
| cy.get('#joinRule-public-description').should('not.exist'); | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
| function openRoomAccessSettings(){ | ||
|
There was a problem hiding this comment. on met ca dans les utils peut etre ? Chepa |
||
| cy.get('.mx_RoomHeader_chevron').click(); | ||
| cy.get('[aria-label="Paramètres"] > .mx_IconizedContextMenu_label').click(); | ||
| cy.get('[data-testid="settings-tab-ROOM_SECURITY_TAB"] > .mx_TabbedView_tabLabel_text').click(); | ||
| } | ||
This file contains 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,51 @@ | ||
| import Chainable = Cypress.Chainable; | ||
|
|
||
| export default class RoomUtils { | ||
|
There was a problem hiding this comment. alternatively, you could use tchap-web-v4/cypress/support/client.ts Lines 40 to 41 in ac8216a But if it works, fine, let's move forward. There was a problem hiding this comment. The convention to do this seems to be to add a file in /cypress/support and create |
||
|
|
||
| static openCreateRoomDialog(): Chainable<JQuery<HTMLElement>> { | ||
| const addRoomLabel = "Ajouter un salon"; | ||
| const newRoomLabel = "Nouveau salon"; | ||
| cy.get(`[aria-label="${addRoomLabel}"]`).click(); | ||
| cy.get(`.mx_ContextualMenu [aria-label="${newRoomLabel}"]`).click(); | ||
| return cy.get(".mx_Dialog"); | ||
| } | ||
|
|
||
|
|
||
| static createPrivateRoom(roomName: string) { | ||
| RoomUtils.openCreateRoomDialog().within(() => { | ||
| // Fill name | ||
| const nameLabel = "Nom"; | ||
| cy.get(`[label="${nameLabel}"]`).type(roomName); | ||
| // Submit | ||
| cy.startMeasuring("from-submit-to-room"); | ||
|
There was a problem hiding this comment. you start measuring here, but never stop, so I don't think it measures anything. (also I don't really know what this measuring does :) ) |
||
| cy.get(".mx_Dialog_primary").click(); | ||
| }); | ||
| } | ||
|
|
||
| static createPublicRoom(roomName: string) { | ||
| RoomUtils.openCreateRoomDialog().within(() => { | ||
| // Fill name | ||
| const nameLabel = "Nom"; | ||
| cy.get(`[label="${nameLabel}"]`).type(roomName); | ||
| // Change room to public | ||
| cy.get(".tc_TchapRoomTypeSelector_forum").click(); | ||
| // Submit | ||
| cy.startMeasuring("from-submit-to-room"); | ||
| cy.get(".mx_Dialog_primary").click(); | ||
| }); | ||
| } | ||
|
|
||
| static createPrivateRoomWithExternal(roomName: string) { | ||
| RoomUtils.openCreateRoomDialog().within(() => { | ||
| // Fill name | ||
| const nameLabel = "Nom"; | ||
| cy.get(`[label="${nameLabel}"]`).type(roomName); | ||
| // Change room to public | ||
| cy.get(".tc_TchapRoomTypeSelector_external").click(); | ||
| // Submit | ||
| cy.startMeasuring("from-submit-to-room"); | ||
| cy.get(".mx_Dialog_primary").click(); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On veut ca ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oui sinon, a chaque changement, il relance les tests c'est tres penible