Skip to content

[7.5] [services/remote] wrap up clearing browser storage with try/catch (#50840) #51130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmlemeshko merged 1 commit into from
Nov 20, 2019
Merged

[7.5] [services/remote] wrap up clearing browser storage with try/catch (#50840) #51130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions test/functional/services/remote/remote.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
const log = getService('log');
const config = getService('config');
const browserType: Browsers = config.get('browser.type');
type BrowserStorage = 'sessionStorage' | 'localStorage';

const clearBrowserStorage = async (storageType: BrowserStorage) => {
try {
await driver.executeScript(`window.${storageType}.clear();`);
} catch (error) {
if (!error.message.includes(`Failed to read the '${storageType}' property from 'Window'`)) {
throw error;
}
}
};

const { driver, By, until, consoleLog$ } = await initWebDriver(
log,
Expand Down Expand Up @@ -75,8 +86,8 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
.manage()
.window()
.setRect({ width, height });
await driver.executeScript('window.sessionStorage.clear();');
await driver.executeScript('window.localStorage.clear();');
await clearBrowserStorage('sessionStorage');
await clearBrowserStorage('localStorage');
});

lifecycle.on('cleanup', async () => await driver.quit());
Expand Down