-
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Stop using the js-sdk's compare function (#12782)
* Stop using the js-sdk's compare function The file is supposed to be a js-sdk internal module so we shouldn't have been using it, and now it uses the native collator, it's completely trivial. It was also causing Intl.Collator to be accessed at the module scope which risked it beating the modernizr check. * add test * Fix tests Move the restoreAllMocks to prevent mock leakage and also add some custom themes to test the ordering of those. * Move spy to the right place * Add ANOTHER test * Add test for integration manager ordering
- Loading branch information
Showing
10 changed files
with
146 additions
and
29 deletions.
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
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
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,70 @@ | ||
/* | ||
Copyright 2024 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. | ||
*/ | ||
|
||
import { MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix"; | ||
import { mocked } from "jest-mock"; | ||
|
||
import { IntegrationManagers } from "../../src/integrations/IntegrationManagers"; | ||
import { stubClient } from "../test-utils"; | ||
|
||
describe("IntegrationManagers", () => { | ||
let client: MatrixClient; | ||
let intMgrs: IntegrationManagers; | ||
|
||
beforeEach(() => { | ||
client = stubClient(); | ||
mocked(client).getAccountData.mockReturnValue({ | ||
getContent: jest.fn().mockReturnValue({ | ||
foo: { | ||
id: "foo", | ||
content: { | ||
type: "m.integration_manager", | ||
url: "http://foo/ui", | ||
data: { | ||
api_url: "http://foo/api", | ||
}, | ||
}, | ||
}, | ||
bar: { | ||
id: "bar", | ||
content: { | ||
type: "m.integration_manager", | ||
url: "http://bar/ui", | ||
data: { | ||
api_url: "http://bar/api", | ||
}, | ||
}, | ||
}, | ||
}), | ||
} as unknown as MatrixEvent); | ||
|
||
intMgrs = new IntegrationManagers(); | ||
intMgrs.startWatching(); | ||
}); | ||
|
||
afterEach(() => { | ||
intMgrs.stopWatching(); | ||
}); | ||
|
||
describe("getOrderedManagers", () => { | ||
it("should return integration managers in alphabetical order", () => { | ||
const orderedManagers = intMgrs.getOrderedManagers(); | ||
|
||
expect(orderedManagers[0].id).toBe("bar"); | ||
expect(orderedManagers[1].id).toBe("foo"); | ||
}); | ||
}); | ||
}); |
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