Skip to content

Commit 295f1df

Browse files
authored
[services/remote] wrap up clearing browser storage with try/catch (#50840)
* [services/remote] wrap up clearing storage with try/catch * improve error handling on clearing storage * apply awesome idea * fix exception message
1 parent 3baa6cc commit 295f1df

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

test/functional/services/remote/remote.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,17 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
3838
const coveragePrefix = 'coveragejson:';
3939
const coverageDir = resolve(__dirname, '../../../../target/kibana-coverage/functional');
4040
let logSubscription: undefined | Rx.Subscription;
41+
type BrowserStorage = 'sessionStorage' | 'localStorage';
42+
43+
const clearBrowserStorage = async (storageType: BrowserStorage) => {
44+
try {
45+
await driver.executeScript(`window.${storageType}.clear();`);
46+
} catch (error) {
47+
if (!error.message.includes(`Failed to read the '${storageType}' property from 'Window'`)) {
48+
throw error;
49+
}
50+
}
51+
};
4152

4253
const { driver, By, until, consoleLog$ } = await initWebDriver(
4354
log,
@@ -128,8 +139,8 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
128139
.manage()
129140
.window()
130141
.setRect({ width, height });
131-
await driver.executeScript('window.sessionStorage.clear();');
132-
await driver.executeScript('window.localStorage.clear();');
142+
await clearBrowserStorage('sessionStorage');
143+
await clearBrowserStorage('localStorage');
133144
});
134145

135146
lifecycle.on('cleanup', async () => {

0 commit comments

Comments
 (0)