Live location sharing - consolidate maps (#8236)

* extract location markers into generic Marker Signed-off-by: Kerry Archibald <kerrya@element.io> * wrap marker in smartmarker Signed-off-by: Kerry Archibald <kerrya@element.io> * test smartmarker Signed-off-by: Kerry Archibald <kerrya@element.io> * working map in location body Signed-off-by: Kerry Archibald <kerrya@element.io> * test Map Signed-off-by: Kerry Archibald <kerrya@element.io> * remove skinned sdk Signed-off-by: Kerry Archibald <kerrya@element.io> * update snaps with new mocks Signed-off-by: Kerry Archibald <kerrya@element.io> * use new ZoomButtons in MLocationBody Signed-off-by: Kerry Archibald <kerrya@element.io> * make LocationViewDialog map interactive Signed-off-by: Kerry Archibald <kerrya@element.io> * test MLocationBody Signed-off-by: Kerry Archibald <kerrya@element.io> * test LocationViewDialog Signed-off-by: Kerry Archibald <kerrya@element.io> * add copyrights, shrink snapshot Signed-off-by: Kerry Archibald <kerrya@element.io> * update comment Signed-off-by: Kerry Archibald <kerrya@element.io> * lint Signed-off-by: Kerry Archibald <kerrya@element.io> * lint Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-04-11 18:40:06 +02:00 · 2022-04-11 18:40:06 +02:00 · 9ba55d1d14
commit 9ba55d1d14
parent 944e11d7d6
16 changed files with 890 additions and 235 deletions
--- a/test/components/views/location/LocationViewDialog-test.tsx
+++ b/test/components/views/location/LocationViewDialog-test.tsx
@ -0,0 +1,56 @@
+/*
+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.
+*/
+
+import React from 'react';
+import { mount } from 'enzyme';
+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 { 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' },
+        }),
+        isGuest: jest.fn().mockReturnValue(false),
+    });
+    const defaultEvent = makeLocationEvent("geo:51.5076,-0.1276", LocationAssetType.Pin);
+    const defaultProps = {
+        matrixClient: mockClient,
+        mxEvent: defaultEvent,
+        onFinished: jest.fn(),
+    };
+    const getComponent = (props = {}) =>
+        mount(<LocationViewDialog {...defaultProps} {...props} />);
+
+    it('renders map correctly', () => {
+        const component = getComponent();
+        expect(component.find('Map')).toMatchSnapshot();
+    });
+
+    it('renders marker correctly for self share', () => {
+        const selfShareEvent = makeLocationEvent("geo:51.5076,-0.1276", LocationAssetType.Self);
+        const member = new RoomMember(roomId, userId);
+        // @ts-ignore cheat assignment to property
+        selfShareEvent.sender = member;
+        const component = getComponent({ mxEvent: selfShareEvent });
+        expect(component.find('SmartMarker').props()['roomMember']).toEqual(member);
+    });
+});