Skip to content

[services/remote] wrap up clearing browser storage with try/catch #50840

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
merged 7 commits into from
Nov 19, 2019
Merged

[services/remote] wrap up clearing browser storage with try/catch #50840

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
86b237d
[services/remote] wrap up clearing storage with try/catch
dmlemeshko Nov 16, 2019
101fb18
Merge branch 'master' into fix/ftr-fails-to-clear-session-storage
elasticmachine Nov 18, 2019
4bc753c
Merge remote-tracking branch 'upstream/master' into fix/ftr-fails-to-…
dmlemeshko Nov 19, 2019
40cb8ef
improve error handling on clearing storage
dmlemeshko Nov 19, 2019
f214d08
Merge branch 'fix/ftr-fails-to-clear-session-storage' of github.com:d…
dmlemeshko Nov 19, 2019
dad5df6
apply awesome idea
dmlemeshko Nov 19, 2019
7735a1d
fix exception message
dmlemeshko Nov 19, 2019
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 @@ -38,6 +38,17 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
const coveragePrefix = 'coveragejson:';
const coverageDir = resolve(__dirname, '../../../../target/kibana-coverage/functional');
let logSubscription: undefined | Rx.Subscription;
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'`)) {
Copy link
Contributor

@spalger spalger Nov 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This used to have single quotes around the storage type, which one is correct?

Copy link
Member Author

@dmlemeshko dmlemeshko Nov 19, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right Spencer, I actually tested with quotes 😫

throw error;
}
}
};

const { driver, By, until, consoleLog$ } = await initWebDriver(
log,
Expand Down Expand Up @@ -128,8 +139,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 () => {
Expand Down