From f8da25776915332c0daf59b98d332a7de4c89afe Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Sep 2024 14:08:23 +0100 Subject: [PATCH 1/2] Update repos for changelog fetching --- src/components/views/dialogs/ChangelogDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/ChangelogDialog.tsx b/src/components/views/dialogs/ChangelogDialog.tsx index ca110aa16f..382f9a858e 100644 --- a/src/components/views/dialogs/ChangelogDialog.tsx +++ b/src/components/views/dialogs/ChangelogDialog.tsx @@ -38,7 +38,7 @@ interface Commit { }; } -const REPOS = ["vector-im/element-web", "matrix-org/matrix-react-sdk", "matrix-org/matrix-js-sdk"] as const; +const REPOS = ["element-hq/element-web", "element-hq/matrix-react-sdk", "matrix-org/matrix-js-sdk"] as const; export default class ChangelogDialog extends React.Component { public constructor(props: IProps) { From 9601be583bde4740d956b3030493d871607ff0a7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Sep 2024 14:16:25 +0100 Subject: [PATCH 2/2] Update tests --- .../views/dialogs/ChangelogDialog-test.tsx | 28 +++++++++---------- .../ChangelogDialog-test.tsx.snap | 8 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/components/views/dialogs/ChangelogDialog-test.tsx b/test/components/views/dialogs/ChangelogDialog-test.tsx index a8f394f64d..948d6e2010 100644 --- a/test/components/views/dialogs/ChangelogDialog-test.tsx +++ b/test/components/views/dialogs/ChangelogDialog-test.tsx @@ -22,13 +22,13 @@ import ChangelogDialog from "../../../../src/components/views/dialogs/ChangelogD describe("", () => { it("should fetch github proxy url for each repo with old and new version strings", async () => { - const webUrl = "https://riot.im/github/repos/vector-im/element-web/compare/oldsha1...newsha1"; + const webUrl = "https://riot.im/github/repos/element-hq/element-web/compare/oldsha1...newsha1"; fetchMock.get(webUrl, { - url: "https://api.github.com/repos/vector-im/element-web/compare/master...develop", - html_url: "https://github.com/vector-im/element-web/compare/master...develop", - permalink_url: "https://github.com/vector-im/element-web/compare/vector-im:72ca95e...vector-im:8891698", - diff_url: "https://github.com/vector-im/element-web/compare/master...develop.diff", - patch_url: "https://github.com/vector-im/element-web/compare/master...develop.patch", + url: "https://api.github.com/repos/element-hq/element-web/compare/master...develop", + html_url: "https://github.com/element-hq/element-web/compare/master...develop", + permalink_url: "https://github.com/element-hq/element-web/compare/vector-im:72ca95e...vector-im:8891698", + diff_url: "https://github.com/element-hq/element-web/compare/master...develop.diff", + patch_url: "https://github.com/element-hq/element-web/compare/master...develop.patch", base_commit: {}, merge_base_commit: {}, status: "ahead", @@ -38,19 +38,19 @@ describe("", () => { commits: [ { sha: "commit-sha", - html_url: "https://api.github.com/repos/vector-im/element-web/commit/commit-sha", + html_url: "https://api.github.com/repos/element-hq/element-web/commit/commit-sha", commit: { message: "This is the first commit message" }, }, ], files: [], }); - const reactUrl = "https://riot.im/github/repos/matrix-org/matrix-react-sdk/compare/oldsha2...newsha2"; + const reactUrl = "https://riot.im/github/repos/element-hq/matrix-react-sdk/compare/oldsha2...newsha2"; fetchMock.get(reactUrl, { - url: "https://api.github.com/repos/matrix-org/matrix-react-sdk/compare/master...develop", - html_url: "https://github.com/matrix-org/matrix-react-sdk/compare/master...develop", - permalink_url: "https://github.com/matrix-org/matrix-react-sdk/compare/matrix-org:cdb00...matrix-org:4a926", - diff_url: "https://github.com/matrix-org/matrix-react-sdk/compare/master...develop.diff", - patch_url: "https://github.com/matrix-org/matrix-react-sdk/compare/master...develop.patch", + url: "https://api.github.com/repos/element-hq/matrix-react-sdk/compare/master...develop", + html_url: "https://github.com/element-hq/matrix-react-sdk/compare/master...develop", + permalink_url: "https://github.com/element-hq/matrix-react-sdk/compare/matrix-org:cdb00...matrix-org:4a926", + diff_url: "https://github.com/element-hq/matrix-react-sdk/compare/master...develop.diff", + patch_url: "https://github.com/element-hq/matrix-react-sdk/compare/master...develop.patch", base_commit: {}, merge_base_commit: {}, status: "ahead", @@ -60,7 +60,7 @@ describe("", () => { commits: [ { sha: "commit-sha0", - html_url: "https://api.github.com/repos/matrix-org/matrix-react-sdk/commit/commit-sha", + html_url: "https://api.github.com/repos/element-hq/matrix-react-sdk/commit/commit-sha", commit: { message: "This is a commit message" }, }, ], diff --git a/test/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap index 11e0c2135c..d4609d6168 100644 --- a/test/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap +++ b/test/components/views/dialogs/__snapshots__/ChangelogDialog-test.tsx.snap @@ -35,14 +35,14 @@ exports[` should fetch github proxy url for each repo with ol

- vector-im/element-web + element-hq/element-web