-
-
Notifications
You must be signed in to change notification settings - Fork 831
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/improved-pills
- Loading branch information
Showing
205 changed files
with
8,268 additions
and
9,934 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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 was deleted.
Oops, something went wrong.
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,24 @@ | ||
| name: Pull Request | ||
| on: | ||
| pull_request_target: | ||
| types: [ opened, edited, labeled, unlabeled ] | ||
| jobs: | ||
| changelog: | ||
| name: Preview Changelog | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: matrix-org/allchange@main | ||
| with: | ||
| ghToken: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| enforce-label: | ||
| name: Enforce Labels | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| pull-requests: read | ||
| steps: | ||
| - uses: yogevbd/enforce-label-action@2.1.0 | ||
| with: | ||
| REQUIRED_LABELS_ANY: "T-Defect,T-Enhancement,T-Task" | ||
| BANNED_LABELS: "X-Blocked" | ||
| BANNED_LABELS_DESCRIPTION: "Preventing merge whilst PR is marked blocked!" |
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,47 @@ | ||
| name: SonarQube | ||
| on: | ||
| workflow_run: | ||
| workflows: [ "Tests" ] | ||
| types: | ||
| - completed | ||
| jobs: | ||
| sonarqube: | ||
| name: SonarQube | ||
| runs-on: ubuntu-latest | ||
| if: github.event.workflow_run.conclusion == 'success' | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis | ||
|
|
||
| # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action | ||
| # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess: | ||
| - name: Download Coverage Report | ||
| uses: actions/github-script@v3.1.0 | ||
| with: | ||
| script: | | ||
| const artifacts = await github.actions.listWorkflowRunArtifacts({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| run_id: ${{ github.event.workflow_run.id }}, | ||
| }); | ||
| const matchArtifact = artifacts.data.artifacts.filter((artifact) => { | ||
| return artifact.name == "coverage" | ||
| })[0]; | ||
| const download = await github.actions.downloadArtifact({ | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| artifact_id: matchArtifact.id, | ||
| archive_format: 'zip', | ||
| }); | ||
| const fs = require('fs'); | ||
| fs.writeFileSync('${{github.workspace}}/coverage.zip', Buffer.from(download.data)); | ||
| - name: Extract Coverage Report | ||
| run: unzip -d coverage coverage.zip && rm coverage.zip | ||
|
|
||
| - name: SonarCloud Scan | ||
| uses: SonarSource/sonarcloud-github-action@master | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any | ||
| SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} |
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,8 @@ | ||
| name: Upgrade Dependencies | ||
| on: | ||
| workflow_dispatch: { } | ||
| jobs: | ||
| upgrade: | ||
| uses: matrix-org/matrix-js-sdk/.github/workflows/upgrade_dependencies.yml@develop | ||
| secrets: | ||
| ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} |
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,57 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| 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 { SynapseInstance } from "../../plugins/synapsedocker"; | ||
|
|
||
| describe("Login", () => { | ||
| let synapse: SynapseInstance; | ||
|
|
||
| beforeEach(() => { | ||
| cy.visit("/#/login"); | ||
| cy.startSynapse("consent").then(data => { | ||
| synapse = data; | ||
| }); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| cy.stopSynapse(synapse); | ||
| }); | ||
|
|
||
| describe("m.login.password", () => { | ||
| const username = "user1234"; | ||
| const password = "p4s5W0rD"; | ||
|
|
||
| beforeEach(() => { | ||
| cy.registerUser(synapse, username, password); | ||
| }); | ||
|
|
||
| it("logs in with an existing account and lands on the home screen", () => { | ||
| cy.get(".mx_ServerPicker_change", { timeout: 15000 }).click(); | ||
| cy.get(".mx_ServerPickerDialog_otherHomeserver").type(synapse.baseUrl); | ||
| cy.get(".mx_ServerPickerDialog_continue").click(); | ||
| // wait for the dialog to go away | ||
| cy.get('.mx_ServerPickerDialog').should('not.exist'); | ||
|
|
||
| cy.get("#mx_LoginForm_username").type(username); | ||
| cy.get("#mx_LoginForm_password").type(password); | ||
| cy.get(".mx_Login_submit").click(); | ||
|
|
||
| cy.url().should('contain', '/#/home'); | ||
| }); | ||
| }); | ||
| }); |
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,45 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| 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 { SynapseInstance } from "../../plugins/synapsedocker"; | ||
| import type { UserCredentials } from "../../support/login"; | ||
|
|
||
| describe("UserMenu", () => { | ||
| let synapse: SynapseInstance; | ||
| let user: UserCredentials; | ||
|
|
||
| beforeEach(() => { | ||
| cy.startSynapse("consent").then(data => { | ||
| synapse = data; | ||
|
|
||
| cy.initTestUser(synapse, "Jeff").then(credentials => { | ||
| user = credentials; | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| cy.stopSynapse(synapse); | ||
| }); | ||
|
|
||
| it("should contain our name & userId", () => { | ||
| cy.get('[aria-label="User menu"]', { timeout: 15000 }).click(); | ||
| cy.get(".mx_UserMenu_contextMenu_displayName").should("contain", "Jeff"); | ||
| cy.get(".mx_UserMenu_contextMenu_userId").should("contain", user.userId); | ||
| }); | ||
| }); |
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.