use unstable prefix for wk tile_Server

Signed-off-by: Kerry Archibald <kerrya@element.io>
matrix-org · Apr 14, 2022 · d73f510 · d73f510
1 parent c35fc16
commit d73f510
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/utils/WellKnownUtils.ts b/src/utils/WellKnownUtils.ts
@@ -22,7 +22,7 @@ import { MatrixClientPeg } from '../MatrixClientPeg';
 const CALL_BEHAVIOUR_WK_KEY = "io.element.call_behaviour";
 const E2EE_WK_KEY = "io.element.e2ee";
 const E2EE_WK_KEY_DEPRECATED = "im.vector.riot.e2ee";
-const TILE_SERVER_WK_KEY = new UnstableValue(
+export const TILE_SERVER_WK_KEY = new UnstableValue(
     "m.tile_server", "org.matrix.msc3488.tile_server");
 
 /* eslint-disable camelcase */

diff --git a/test/components/views/location/LocationViewDialog-test.tsx b/test/components/views/location/LocationViewDialog-test.tsx
@@ -20,14 +20,15 @@ import { RoomMember } from 'matrix-js-sdk/src/matrix';
 import { LocationAssetType } from 'matrix-js-sdk/src/@types/location';
 
 import LocationViewDialog from '../../../../src/components/views/location/LocationViewDialog';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
 import { getMockClientWithEventEmitter, makeLocationEvent } from '../../../test-utils';
 
 describe('<LocationViewDialog />', () => {
     const roomId = '!room:server';
     const userId = '@user:server';
     const mockClient = getMockClientWithEventEmitter({
         getClientWellKnown: jest.fn().mockReturnValue({
-            "m.tile_server": { map_style_url: 'maps.com' },
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
         }),
         isGuest: jest.fn().mockReturnValue(false),
     });

diff --git a/test/components/views/location/Map-test.tsx b/test/components/views/location/Map-test.tsx
@@ -24,6 +24,7 @@ import { logger } from 'matrix-js-sdk/src/logger';
 import Map from '../../../../src/components/views/location/Map';
 import { findByTestId, getMockClientWithEventEmitter } from '../../../test-utils';
 import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
 
 describe('<Map />', () => {
     const defaultProps = {
@@ -34,7 +35,7 @@ describe('<Map />', () => {
     };
     const matrixClient = getMockClientWithEventEmitter({
         getClientWellKnown: jest.fn().mockReturnValue({
-            "m.tile_server": { map_style_url: 'maps.com' },
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
         }),
     });
     const getComponent = (props = {}) =>
@@ -46,7 +47,7 @@ describe('<Map />', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         matrixClient.getClientWellKnown.mockReturnValue({
-            "m.tile_server": { map_style_url: 'maps.com' },
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
         });
 
         jest.spyOn(logger, 'error').mockRestore();
@@ -65,7 +66,7 @@ describe('<Map />', () => {
 
             act(() => {
                 matrixClient.emit(ClientEvent.ClientWellKnown, {
-                    "m.tile_server": { map_style_url: 'new.maps.com' },
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: 'new.maps.com' },
                 });
             });
 
@@ -77,7 +78,7 @@ describe('<Map />', () => {
 
             act(() => {
                 matrixClient.emit(ClientEvent.ClientWellKnown, {
-                    "m.tile_server": { map_style_url: undefined },
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: undefined },
                 });
             });
 

diff --git a/test/components/views/messages/MBeaconBody-test.tsx b/test/components/views/messages/MBeaconBody-test.tsx
@@ -29,6 +29,7 @@ import { getMockClientWithEventEmitter, makeBeaconEvent, makeBeaconInfoEvent } f
 import { RoomPermalinkCreator } from '../../../../src/utils/permalinks/Permalinks';
 import { MediaEventHelper } from '../../../../src/utils/MediaEventHelper';
 import MatrixClientContext from '../../../../src/contexts/MatrixClientContext';
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
 
 describe('<MBeaconBody />', () => {
     // 14.03.2022 16:15
@@ -43,7 +44,7 @@ describe('<MBeaconBody />', () => {
 
     const mockClient = getMockClientWithEventEmitter({
         getClientWellKnown: jest.fn().mockReturnValue({
-            "m.tile_server": { map_style_url: 'maps.com' },
+            [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
         }),
         getUserId: jest.fn().mockReturnValue(aliceId),
         getRoom: jest.fn(),

diff --git a/test/components/views/messages/MLocationBody-test.tsx b/test/components/views/messages/MLocationBody-test.tsx
@@ -28,6 +28,7 @@ import { RoomPermalinkCreator } from "../../../../src/utils/permalinks/Permalink
 import { MediaEventHelper } from "../../../../src/utils/MediaEventHelper";
 import Modal from '../../../../src/Modal';
 import SdkConfig from "../../../../src/SdkConfig";
+import { TILE_SERVER_WK_KEY } from '../../../../src/utils/WellKnownUtils';
 import { makeLocationEvent } from "../../../test-utils/location";
 import { getMockClientWithEventEmitter } from '../../../test-utils';
 
@@ -37,7 +38,7 @@ describe("MLocationBody", () => {
         const userId = '@user:server';
         const mockClient = getMockClientWithEventEmitter({
             getClientWellKnown: jest.fn().mockReturnValue({
-                "m.tile_server": { map_style_url: 'maps.com' },
+                [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
             }),
             isGuest: jest.fn().mockReturnValue(false),
         });
@@ -78,7 +79,7 @@ describe("MLocationBody", () => {
             it('displays correct fallback content when map_style_url is misconfigured', () => {
                 const mockMap = new maplibregl.Map();
                 mockClient.getClientWellKnown.mockReturnValue({
-                    "m.tile_server": { map_style_url: 'bad-tile-server.com' },
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: 'bad-tile-server.com' },
                 });
                 const component = getComponent();
 
@@ -93,7 +94,7 @@ describe("MLocationBody", () => {
         describe('without error', () => {
             beforeEach(() => {
                 mockClient.getClientWellKnown.mockReturnValue({
-                    "m.tile_server": { map_style_url: 'maps.com' },
+                    [TILE_SERVER_WK_KEY.name]: { map_style_url: 'maps.com' },
                 });
 
                 // MLocationBody uses random number for map id