From 8c6786bad68807cff2f2e979ef6b0b9bdbe4e578 Mon Sep 17 00:00:00 2001 From: Kerry Date: Mon, 25 Apr 2022 14:44:18 +0200 Subject: [PATCH] LLS: rename wireError (#8401) * rename wireError in ownbeaconstore to locationPublishError Signed-off-by: Kerry Archibald * rename getLiveBeaconIdsWithWireError -> getLiveBeaconIdsWithLocationPublishError Signed-off-by: Kerry Archibald * rename wire error variables in components Signed-off-by: Kerry Archibald * new snapshots for new test names Signed-off-by: Kerry Archibald * fix bad capitalisation on onResetLocationPublishError Signed-off-by: Kerry Archibald * missed variable Signed-off-by: Kerry Archibald --- .../beacon/LeftPanelLiveShareWarning.tsx | 14 ++--- .../views/beacon/OwnBeaconStatus.tsx | 10 +-- .../views/beacon/RoomLiveShareWarning.tsx | 18 +++--- src/stores/OwnBeaconStore.ts | 44 ++++++------- src/utils/beacon/useOwnLiveBeacons.ts | 18 +++--- .../beacon/LeftPanelLiveShareWarning-test.tsx | 24 ++++--- .../views/beacon/OwnBeaconStatus-test.tsx | 18 +++--- .../beacon/RoomLiveShareWarning-test.tsx | 63 ++++++++++--------- .../LeftPanelLiveShareWarning-test.tsx.snap | 2 +- .../RoomLiveShareWarning-test.tsx.snap | 2 +- test/stores/OwnBeaconStore-test.ts | 40 ++++++------ 11 files changed, 133 insertions(+), 120 deletions(-) diff --git a/src/components/views/beacon/LeftPanelLiveShareWarning.tsx b/src/components/views/beacon/LeftPanelLiveShareWarning.tsx index 07ba4cd236..e13c1620ca 100644 --- a/src/components/views/beacon/LeftPanelLiveShareWarning.tsx +++ b/src/components/views/beacon/LeftPanelLiveShareWarning.tsx @@ -53,10 +53,10 @@ const LeftPanelLiveShareWarning: React.FC = ({ isMinimized }) => { () => OwnBeaconStore.instance.isMonitoringLiveLocation, ); - const beaconIdsWithWireError = useEventEmitterState( + const beaconIdsWithLocationPublishError = useEventEmitterState( OwnBeaconStore.instance, - OwnBeaconStoreEvent.WireError, - () => OwnBeaconStore.instance.getLiveBeaconIdsWithWireError(), + OwnBeaconStoreEvent.LocationPublishError, + () => OwnBeaconStore.instance.getLiveBeaconIdsWithLocationPublishError(), ); const liveBeaconIds = useEventEmitterState( @@ -65,13 +65,13 @@ const LeftPanelLiveShareWarning: React.FC = ({ isMinimized }) => { () => OwnBeaconStore.instance.getLiveBeaconIds(), ); - const hasWireErrors = !!beaconIdsWithWireError.length; + const hasLocationPublishErrors = !!beaconIdsWithLocationPublishError.length; if (!isMonitoringLiveLocation) { return null; } - const relevantBeaconRoomId = chooseBestBeaconRoomId(liveBeaconIds, beaconIdsWithWireError); + const relevantBeaconRoomId = chooseBestBeaconRoomId(liveBeaconIds, beaconIdsWithLocationPublishError); const onWarningClick = relevantBeaconRoomId ? () => { dispatcher.dispatch({ @@ -81,14 +81,14 @@ const LeftPanelLiveShareWarning: React.FC = ({ isMinimized }) => { }); } : undefined; - const label = hasWireErrors ? + const label = hasLocationPublishErrors ? _t('An error occured whilst sharing your live location') : _t('You are sharing your live location'); return > = ({ beacon, displayStatus, ...rest }) => { const { - hasWireError, + hasLocationPublishError, hasStopSharingError, stoppingInProgress, onStopSharing, - onResetWireError, + onResetLocationPublishError, } = useOwnLiveBeacons([beacon?.identifier]); // combine display status with errors that only occur for user's own beacons - const ownDisplayStatus = hasWireError || hasStopSharingError ? + const ownDisplayStatus = hasLocationPublishError || hasStopSharingError ? BeaconDisplayStatus.Error : displayStatus; @@ -67,10 +67,10 @@ const OwnBeaconStatus: React.FC> = ({ { _t('Stop') } } - { hasWireError && { _t('Retry') } diff --git a/src/components/views/beacon/RoomLiveShareWarning.tsx b/src/components/views/beacon/RoomLiveShareWarning.tsx index 01c749a26a..e1679fc661 100644 --- a/src/components/views/beacon/RoomLiveShareWarning.tsx +++ b/src/components/views/beacon/RoomLiveShareWarning.tsx @@ -28,8 +28,8 @@ import StyledLiveBeaconIcon from './StyledLiveBeaconIcon'; import { Icon as CloseIcon } from '../../../../res/img/image-view/close.svg'; import LiveTimeRemaining from './LiveTimeRemaining'; -const getLabel = (hasWireError: boolean, hasStopSharingError: boolean): string => { - if (hasWireError) { +const getLabel = (hasLocationPublishError: boolean, hasStopSharingError: boolean): string => { + if (hasLocationPublishError) { return _t('An error occured whilst sharing your live location, please try again'); } if (hasStopSharingError) { @@ -45,22 +45,22 @@ interface RoomLiveShareWarningInnerProps { const RoomLiveShareWarningInner: React.FC = ({ liveBeaconIds, roomId }) => { const { onStopSharing, - onResetWireError, + onResetLocationPublishError, beacon, stoppingInProgress, hasStopSharingError, - hasWireError, + hasLocationPublishError, } = useOwnLiveBeacons(liveBeaconIds); if (!beacon) { return null; } - const hasError = hasStopSharingError || hasWireError; + const hasError = hasStopSharingError || hasLocationPublishError; const onButtonClick = () => { - if (hasWireError) { - onResetWireError(); + if (hasLocationPublishError) { + onResetLocationPublishError(); } else { onStopSharing(); } @@ -72,7 +72,7 @@ const RoomLiveShareWarningInner: React.FC = ({ l - { getLabel(hasWireError, hasStopSharingError) } + { getLabel(hasLocationPublishError, hasStopSharingError) } { stoppingInProgress && @@ -90,7 +90,7 @@ const RoomLiveShareWarningInner: React.FC = ({ l > { hasError ? _t('Retry') : _t('Stop sharing') } - { hasWireError && beacon.beaconIn export enum OwnBeaconStoreEvent { LivenessChange = 'OwnBeaconStore.LivenessChange', MonitoringLivePosition = 'OwnBeaconStore.MonitoringLivePosition', - WireError = 'WireError', + LocationPublishError = 'LocationPublishError', } const MOVING_UPDATE_INTERVAL = 2000; @@ -60,7 +60,7 @@ const BAIL_AFTER_CONSECUTIVE_ERROR_COUNT = 2; type OwnBeaconStoreState = { beacons: Map; - beaconWireErrors: Map; + beaconLocationPublishErrorCounts: Map; beaconsByRoomId: Map>; liveBeaconIds: BeaconIdentifier[]; }; @@ -98,7 +98,7 @@ export class OwnBeaconStore extends AsyncStoreWithClient { * Counts consecutive wire errors per beacon * Reset on successful publish of location */ - public readonly beaconWireErrorCounts = new Map(); + public readonly beaconLocationPublishErrorCounts = new Map(); /** * ids of live beacons * ordered by creation time descending @@ -143,7 +143,7 @@ export class OwnBeaconStore extends AsyncStoreWithClient { this.beacons.clear(); this.beaconsByRoomId.clear(); this.liveBeaconIds = []; - this.beaconWireErrorCounts.clear(); + this.beaconLocationPublishErrorCounts.clear(); } protected async onReady(): Promise { @@ -168,8 +168,8 @@ export class OwnBeaconStore extends AsyncStoreWithClient { * Some live beacon has a wire error * Optionally filter by room */ - public hasWireErrors = (roomId?: string): boolean => { - return this.getLiveBeaconIds(roomId).some(this.beaconHasWireError); + public hasLocationPublishErrors = (roomId?: string): boolean => { + return this.getLiveBeaconIds(roomId).some(this.beaconHasLocationPublishError); }; /** @@ -177,12 +177,12 @@ export class OwnBeaconStore extends AsyncStoreWithClient { * past the allowed consecutive failure count (BAIL_AFTER_CONSECUTIVE_ERROR_COUNT) * Then consider it to have an error */ - public beaconHasWireError = (beaconId: string): boolean => { - return this.beaconWireErrorCounts.get(beaconId) >= BAIL_AFTER_CONSECUTIVE_ERROR_COUNT; + public beaconHasLocationPublishError = (beaconId: string): boolean => { + return this.beaconLocationPublishErrorCounts.get(beaconId) >= BAIL_AFTER_CONSECUTIVE_ERROR_COUNT; }; - public resetWireError = (beaconId: string): void => { - this.incrementBeaconWireErrorCount(beaconId, false); + public resetLocationPublishError = (beaconId: string): void => { + this.incrementBeaconLocationPublishErrorCount(beaconId, false); // always publish to all live beacons together // instead of just one that was changed @@ -198,8 +198,8 @@ export class OwnBeaconStore extends AsyncStoreWithClient { return this.liveBeaconIds.filter(beaconId => this.beaconsByRoomId.get(roomId)?.has(beaconId)); }; - public getLiveBeaconIdsWithWireError = (roomId?: string): string[] => { - return this.getLiveBeaconIds(roomId).filter(this.beaconHasWireError); + public getLiveBeaconIdsWithLocationPublishError = (roomId?: string): string[] => { + return this.getLiveBeaconIds(roomId).filter(this.beaconHasLocationPublishError); }; public getBeaconById = (beaconId: string): Beacon | undefined => { @@ -300,7 +300,7 @@ export class OwnBeaconStore extends AsyncStoreWithClient { * Live beacon ids that do not have wire errors */ private get healthyLiveBeaconIds() { - return this.liveBeaconIds.filter(beaconId => !this.beaconHasWireError(beaconId)); + return this.liveBeaconIds.filter(beaconId => !this.beaconHasLocationPublishError(beaconId)); } private initialiseBeaconState = () => { @@ -546,10 +546,10 @@ export class OwnBeaconStore extends AsyncStoreWithClient { const content = makeBeaconContent(geoUri, timestamp, beacon.beaconInfoId); try { await this.matrixClient.sendEvent(beacon.roomId, M_BEACON.name, content); - this.incrementBeaconWireErrorCount(beacon.identifier, false); + this.incrementBeaconLocationPublishErrorCount(beacon.identifier, false); } catch (error) { logger.error(error); - this.incrementBeaconWireErrorCount(beacon.identifier, true); + this.incrementBeaconLocationPublishErrorCount(beacon.identifier, true); } }; @@ -559,22 +559,22 @@ export class OwnBeaconStore extends AsyncStoreWithClient { * - increment count for beacon when is error * - emit if beacon error count crossed threshold */ - private incrementBeaconWireErrorCount = (beaconId: string, isError: boolean): void => { - const hadError = this.beaconHasWireError(beaconId); + private incrementBeaconLocationPublishErrorCount = (beaconId: string, isError: boolean): void => { + const hadError = this.beaconHasLocationPublishError(beaconId); if (isError) { // increment error count - this.beaconWireErrorCounts.set( + this.beaconLocationPublishErrorCounts.set( beaconId, - (this.beaconWireErrorCounts.get(beaconId) ?? 0) + 1, + (this.beaconLocationPublishErrorCounts.get(beaconId) ?? 0) + 1, ); } else { // clear any error count - this.beaconWireErrorCounts.delete(beaconId); + this.beaconLocationPublishErrorCounts.delete(beaconId); } - if (this.beaconHasWireError(beaconId) !== hadError) { - this.emit(OwnBeaconStoreEvent.WireError, beaconId); + if (this.beaconHasLocationPublishError(beaconId) !== hadError) { + this.emit(OwnBeaconStoreEvent.LocationPublishError, beaconId); } }; } diff --git a/src/utils/beacon/useOwnLiveBeacons.ts b/src/utils/beacon/useOwnLiveBeacons.ts index 32361f01c9..fcbd8b38a5 100644 --- a/src/utils/beacon/useOwnLiveBeacons.ts +++ b/src/utils/beacon/useOwnLiveBeacons.ts @@ -24,10 +24,10 @@ import { sortBeaconsByLatestExpiry } from "./duration"; type LiveBeaconsState = { beacon?: Beacon; onStopSharing?: () => void; - onResetWireError?: () => void; + onResetLocationPublishError?: () => void; stoppingInProgress?: boolean; hasStopSharingError?: boolean; - hasWireError?: boolean; + hasLocationPublishError?: boolean; }; /** @@ -41,11 +41,11 @@ export const useOwnLiveBeacons = (liveBeaconIds: BeaconIdentifier[]): LiveBeacon const [stoppingInProgress, setStoppingInProgress] = useState(false); const [error, setError] = useState(); - const hasWireError = useEventEmitterState( + const hasLocationPublishError = useEventEmitterState( OwnBeaconStore.instance, - OwnBeaconStoreEvent.WireError, + OwnBeaconStoreEvent.LocationPublishError, () => - liveBeaconIds.some(OwnBeaconStore.instance.beaconHasWireError), + liveBeaconIds.some(OwnBeaconStore.instance.beaconHasLocationPublishError), ); // reset stopping in progress on change in live ids @@ -72,16 +72,16 @@ export const useOwnLiveBeacons = (liveBeaconIds: BeaconIdentifier[]): LiveBeacon } }; - const onResetWireError = () => { - liveBeaconIds.map(beaconId => OwnBeaconStore.instance.resetWireError(beaconId)); + const onResetLocationPublishError = () => { + liveBeaconIds.map(beaconId => OwnBeaconStore.instance.resetLocationPublishError(beaconId)); }; return { onStopSharing, - onResetWireError, + onResetLocationPublishError, beacon, stoppingInProgress, - hasWireError, + hasLocationPublishError, hasStopSharingError: !!error, }; }; diff --git a/test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx b/test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx index a53937a6e5..a9fe8e55d7 100644 --- a/test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx +++ b/test/components/views/beacon/LeftPanelLiveShareWarning-test.tsx @@ -30,7 +30,7 @@ jest.mock('../../../../src/stores/OwnBeaconStore', () => { // eslint-disable-next-line @typescript-eslint/no-var-requires const EventEmitter = require("events"); class MockOwnBeaconStore extends EventEmitter { - public getLiveBeaconIdsWithWireError = jest.fn().mockReturnValue([]); + public getLiveBeaconIdsWithLocationPublishError = jest.fn().mockReturnValue([]); public getBeaconById = jest.fn(); public getLiveBeaconIds = jest.fn().mockReturnValue([]); } @@ -96,7 +96,7 @@ describe('', () => { beforeEach(() => { mocked(OwnBeaconStore.instance).isMonitoringLiveLocation = true; - mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithWireError.mockReturnValue([]); + mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue([]); mocked(OwnBeaconStore.instance).getLiveBeaconIds.mockReturnValue([beacon2.identifier, beacon1.identifier]); }); @@ -126,14 +126,18 @@ describe('', () => { expect(component).toMatchSnapshot(); }); - it('renders wire error', () => { - mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithWireError.mockReturnValue([beacon1.identifier]); + it('renders location publish error', () => { + mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue( + [beacon1.identifier], + ); const component = getComponent(); expect(component).toMatchSnapshot(); }); - it('goes to room of latest beacon with wire error when clicked', () => { - mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithWireError.mockReturnValue([beacon1.identifier]); + it('goes to room of latest beacon with location publish error when clicked', () => { + mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue( + [beacon1.identifier], + ); const component = getComponent(); const dispatchSpy = jest.spyOn(dispatcher, 'dispatch'); @@ -150,7 +154,9 @@ describe('', () => { }); it('goes back to default style when wire errors are cleared', () => { - mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithWireError.mockReturnValue([beacon1.identifier]); + mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue( + [beacon1.identifier], + ); const component = getComponent(); // error mode expect(component.find('.mx_LeftPanelLiveShareWarning').at(0).text()).toEqual( @@ -158,8 +164,8 @@ describe('', () => { ); act(() => { - mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithWireError.mockReturnValue([]); - OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.WireError, 'abc'); + mocked(OwnBeaconStore.instance).getLiveBeaconIdsWithLocationPublishError.mockReturnValue([]); + OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.LocationPublishError, 'abc'); }); component.setProps({}); diff --git a/test/components/views/beacon/OwnBeaconStatus-test.tsx b/test/components/views/beacon/OwnBeaconStatus-test.tsx index a76e514538..57f3f98b82 100644 --- a/test/components/views/beacon/OwnBeaconStatus-test.tsx +++ b/test/components/views/beacon/OwnBeaconStatus-test.tsx @@ -94,12 +94,12 @@ describe('', () => { expect(component.find('AccessibleButton').length).toBeFalsy(); }); - describe('with wire error', () => { + describe('with location publish error', () => { it('renders in error mode', () => { const displayStatus = BeaconDisplayStatus.Active; mocked(useOwnLiveBeacons).mockReturnValue({ - hasWireError: true, - onResetWireError: jest.fn(), + hasLocationPublishError: true, + onResetLocationPublishError: jest.fn(), }); const component = getComponent({ displayStatus, beacon: defaultBeacon }); expect(component.text()).toContain('Live location error'); @@ -107,19 +107,19 @@ describe('', () => { expect(findByTestId(component, 'beacon-status-reset-wire-error').length).toBeTruthy(); }); - it('retry button resets wire error', () => { + it('retry button resets location publish error', () => { const displayStatus = BeaconDisplayStatus.Active; - const onResetWireError = jest.fn(); + const onResetLocationPublishError = jest.fn(); mocked(useOwnLiveBeacons).mockReturnValue({ - hasWireError: true, - onResetWireError, + hasLocationPublishError: true, + onResetLocationPublishError, }); const component = getComponent({ displayStatus, beacon: defaultBeacon }); act(() => { findByTestId(component, 'beacon-status-reset-wire-error').at(0).simulate('click'); }); - expect(onResetWireError).toHaveBeenCalled(); + expect(onResetLocationPublishError).toHaveBeenCalled(); }); }); @@ -127,7 +127,7 @@ describe('', () => { it('renders in error mode', () => { const displayStatus = BeaconDisplayStatus.Active; mocked(useOwnLiveBeacons).mockReturnValue({ - hasWireError: false, + hasLocationPublishError: false, hasStopSharingError: true, onStopSharing: jest.fn(), }); diff --git a/test/components/views/beacon/RoomLiveShareWarning-test.tsx b/test/components/views/beacon/RoomLiveShareWarning-test.tsx index 030ac8ea4a..13ae42fce4 100644 --- a/test/components/views/beacon/RoomLiveShareWarning-test.tsx +++ b/test/components/views/beacon/RoomLiveShareWarning-test.tsx @@ -110,7 +110,7 @@ describe('', () => { }); afterEach(async () => { - jest.spyOn(OwnBeaconStore.instance, 'beaconHasWireError').mockRestore(); + jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError').mockRestore(); await resetAsyncStoreWithClient(OwnBeaconStore.instance); }); @@ -328,46 +328,53 @@ describe('', () => { }); }); - describe('with wire errors', () => { - it('displays wire error when mounted with wire errors', async () => { - const wireErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasWireError') + describe('with location publish errors', () => { + it('displays location publish error when mounted with location publish errors', async () => { + const locationPublishErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError') .mockReturnValue(true); const component = getComponent({ roomId: room2Id }); expect(component).toMatchSnapshot(); - expect(wireErrorSpy).toHaveBeenCalledWith( + expect(locationPublishErrorSpy).toHaveBeenCalledWith( getBeaconInfoIdentifier(room2Beacon1), 0, [getBeaconInfoIdentifier(room2Beacon1)], ); }); - it('displays wire error when wireError event is emitted and beacons have errors', async () => { - const wireErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasWireError') - .mockReturnValue(false); - const component = getComponent({ roomId: room2Id }); + it( + 'displays location publish error when locationPublishError event is emitted' + + ' and beacons have errors', + async () => { + const locationPublishErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError') + .mockReturnValue(false); + const component = getComponent({ roomId: room2Id }); - // update mock and emit event - act(() => { - wireErrorSpy.mockReturnValue(true); - OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.WireError, getBeaconInfoIdentifier(room2Beacon1)); + // update mock and emit event + act(() => { + locationPublishErrorSpy.mockReturnValue(true); + OwnBeaconStore.instance.emit( + OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(room2Beacon1), + ); + }); + component.setProps({}); + + // renders wire error ui + expect(component.find('.mx_RoomLiveShareWarning_label').text()).toEqual( + 'An error occured whilst sharing your live location, please try again', + ); + expect(findByTestId(component, 'room-live-share-wire-error-close-button').length).toBeTruthy(); }); - component.setProps({}); - - // renders wire error ui - expect(component.find('.mx_RoomLiveShareWarning_label').text()).toEqual( - 'An error occured whilst sharing your live location, please try again', - ); - expect(findByTestId(component, 'room-live-share-wire-error-close-button').length).toBeTruthy(); - }); it('stops displaying wire error when errors are cleared', async () => { - const wireErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasWireError') + const locationPublishErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError') .mockReturnValue(true); const component = getComponent({ roomId: room2Id }); // update mock and emit event act(() => { - wireErrorSpy.mockReturnValue(false); - OwnBeaconStore.instance.emit(OwnBeaconStoreEvent.WireError, getBeaconInfoIdentifier(room2Beacon1)); + locationPublishErrorSpy.mockReturnValue(false); + OwnBeaconStore.instance.emit( + OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(room2Beacon1), + ); }); component.setProps({}); @@ -378,9 +385,9 @@ describe('', () => { expect(findByTestId(component, 'room-live-share-wire-error-close-button').length).toBeFalsy(); }); - it('clicking retry button resets wire errors', async () => { - jest.spyOn(OwnBeaconStore.instance, 'beaconHasWireError').mockReturnValue(true); - const resetErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'resetWireError'); + it('clicking retry button resets location publish errors', async () => { + jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError').mockReturnValue(true); + const resetErrorSpy = jest.spyOn(OwnBeaconStore.instance, 'resetLocationPublishError'); const component = getComponent({ roomId: room2Id }); @@ -392,7 +399,7 @@ describe('', () => { }); it('clicking close button stops beacons', async () => { - jest.spyOn(OwnBeaconStore.instance, 'beaconHasWireError').mockReturnValue(true); + jest.spyOn(OwnBeaconStore.instance, 'beaconHasLocationPublishError').mockReturnValue(true); const stopBeaconSpy = jest.spyOn(OwnBeaconStore.instance, 'stopBeacon'); const component = getComponent({ roomId: room2Id }); diff --git a/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap b/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap index bd9f943b35..d1d6dd56c0 100644 --- a/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap +++ b/test/components/views/beacon/__snapshots__/LeftPanelLiveShareWarning-test.tsx.snap @@ -52,7 +52,7 @@ exports[` when user has live location monitor rende `; -exports[` when user has live location monitor renders wire error 1`] = ` +exports[` when user has live location monitor renders location publish error 1`] = ` when user has live beacons and geolocation is exports[` when user has live beacons and geolocation is available stopping beacons displays error when stop sharing fails 1`] = `"
An error occurred while stopping your live location, please try again
"`; -exports[` when user has live beacons and geolocation is available with wire errors displays wire error when mounted with wire errors 1`] = ` +exports[` when user has live beacons and geolocation is available with location publish errors displays location publish error when mounted with location publish errors 1`] = ` diff --git a/test/stores/OwnBeaconStore-test.ts b/test/stores/OwnBeaconStore-test.ts index df1d868e40..5430c11c68 100644 --- a/test/stores/OwnBeaconStore-test.ts +++ b/test/stores/OwnBeaconStore-test.ts @@ -987,9 +987,9 @@ describe('OwnBeaconStore', () => { // called for each position from watchPosition expect(mockClient.sendEvent).toHaveBeenCalledTimes(5); - expect(store.beaconHasWireError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false); - expect(store.getLiveBeaconIdsWithWireError()).toEqual([]); - expect(store.hasWireErrors()).toBe(false); + expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false); + expect(store.getLiveBeaconIdsWithLocationPublishError()).toEqual([]); + expect(store.hasLocationPublishErrors()).toBe(false); }); it('continues publishing positions when a beacon fails intermittently', async () => { @@ -1015,10 +1015,10 @@ describe('OwnBeaconStore', () => { // called for each position from watchPosition expect(mockClient.sendEvent).toHaveBeenCalledTimes(5); - expect(store.beaconHasWireError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false); - expect(store.hasWireErrors()).toBe(false); + expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false); + expect(store.hasLocationPublishErrors()).toBe(false); expect(emitSpy).not.toHaveBeenCalledWith( - OwnBeaconStoreEvent.WireError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), + OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), ); }); @@ -1038,20 +1038,20 @@ describe('OwnBeaconStore', () => { // only two allowed failures expect(mockClient.sendEvent).toHaveBeenCalledTimes(2); - expect(store.beaconHasWireError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(true); - expect(store.getLiveBeaconIdsWithWireError()).toEqual( + expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(true); + expect(store.getLiveBeaconIdsWithLocationPublishError()).toEqual( [getBeaconInfoIdentifier(alicesRoom1BeaconInfo)], ); - expect(store.getLiveBeaconIdsWithWireError(room1Id)).toEqual( + expect(store.getLiveBeaconIdsWithLocationPublishError(room1Id)).toEqual( [getBeaconInfoIdentifier(alicesRoom1BeaconInfo)], ); - expect(store.hasWireErrors()).toBe(true); + expect(store.hasLocationPublishErrors()).toBe(true); expect(emitSpy).toHaveBeenCalledWith( - OwnBeaconStoreEvent.WireError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), + OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), ); }); - it('restarts publishing a beacon after resetting wire error', async () => { + it('restarts publishing a beacon after resetting location publish error', async () => { // always fails to send events mockClient.sendEvent.mockRejectedValue(new Error('oups')); makeRoomsWithStateEvents([ @@ -1067,18 +1067,18 @@ describe('OwnBeaconStore', () => { // only two allowed failures expect(mockClient.sendEvent).toHaveBeenCalledTimes(2); - expect(store.beaconHasWireError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(true); - expect(store.hasWireErrors()).toBe(true); - expect(store.hasWireErrors(room1Id)).toBe(true); + expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(true); + expect(store.hasLocationPublishErrors()).toBe(true); + expect(store.hasLocationPublishErrors(room1Id)).toBe(true); expect(emitSpy).toHaveBeenCalledWith( - OwnBeaconStoreEvent.WireError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), + OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), ); - // reset emitSpy mock counts to asser on wireError again + // reset emitSpy mock counts to assert on locationPublishError again emitSpy.mockClear(); - store.resetWireError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo)); + store.resetLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo)); - expect(store.beaconHasWireError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false); + expect(store.beaconHasLocationPublishError(getBeaconInfoIdentifier(alicesRoom1BeaconInfo))).toBe(false); // 2 more positions from watchPosition in this period await advanceAndFlushPromises(10000); @@ -1086,7 +1086,7 @@ describe('OwnBeaconStore', () => { // 2 from before, 2 new ones expect(mockClient.sendEvent).toHaveBeenCalledTimes(4); expect(emitSpy).toHaveBeenCalledWith( - OwnBeaconStoreEvent.WireError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), + OwnBeaconStoreEvent.LocationPublishError, getBeaconInfoIdentifier(alicesRoom1BeaconInfo), ); }); });