[MM-55134] Don't blank the Site URL when it's not properly configured on an otherwise working server (#2959)
This commit is contained in:
parent
6664059505
commit
1a7516aac9
|
@ -446,6 +446,22 @@ describe('app/serverViewState', () => {
|
||||||
expect(result.validatedURL).toBe('https://mainserver.com/');
|
expect(result.validatedURL).toBe('https://mainserver.com/');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should not update the users URL when the Site URL is blank', async () => {
|
||||||
|
ServerInfo.mockImplementation(() => ({
|
||||||
|
fetchConfigData: jest.fn().mockImplementation(() => {
|
||||||
|
return {
|
||||||
|
serverVersion: '7.8.0',
|
||||||
|
siteName: 'Mattermost',
|
||||||
|
siteURL: '',
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const result = await serverViewState.handleServerURLValidation({}, 'https://server.com');
|
||||||
|
expect(result.status).toBe(URLValidationStatus.OK);
|
||||||
|
expect(result.validatedURL).toBe('https://server.com/');
|
||||||
|
});
|
||||||
|
|
||||||
it('should warn the user when the Site URL is different but unreachable', async () => {
|
it('should warn the user when the Site URL is different but unreachable', async () => {
|
||||||
ServerInfo.mockImplementation(({url}) => ({
|
ServerInfo.mockImplementation(({url}) => ({
|
||||||
fetchConfigData: jest.fn().mockImplementation(() => {
|
fetchConfigData: jest.fn().mockImplementation(() => {
|
||||||
|
|
|
@ -300,7 +300,7 @@ export class ServerViewState {
|
||||||
return {status: URLValidationStatus.URLUpdated, serverVersion: remoteInfo.serverVersion, serverName: remoteInfo.siteName, validatedURL: remoteInfo.siteURL};
|
return {status: URLValidationStatus.URLUpdated, serverVersion: remoteInfo.serverVersion, serverName: remoteInfo.siteName, validatedURL: remoteInfo.siteURL};
|
||||||
}
|
}
|
||||||
|
|
||||||
return {status: URLValidationStatus.OK, serverVersion: remoteInfo.serverVersion, serverName: remoteInfo.siteName, validatedURL: remoteInfo.siteURL};
|
return {status: URLValidationStatus.OK, serverVersion: remoteInfo.serverVersion, serverName: remoteInfo.siteName, validatedURL: remoteURL.toString()};
|
||||||
};
|
};
|
||||||
|
|
||||||
private handleCloseView = (event: IpcMainEvent, viewId: string) => {
|
private handleCloseView = (event: IpcMainEvent, viewId: string) => {
|
||||||
|
|
Loading…
Reference in a new issue