Skip to content

Commit dad5df6

Browse files
committed
apply awesome idea
1 parent f214d08 commit dad5df6

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

test/functional/services/remote/poll_for_log_entry.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ export function pollForLogEntry$(
7878
entry.level = logging.getLevel('INFO');
7979
}
8080

81-
// ignore Webdriver failure to clear browser storage
82-
if (
83-
entry.message.match(
84-
`WebDriverError: SecurityError: Failed to read the '(localStorage|sessionStorage)' property from 'Window'`
85-
)
86-
) {
87-
return false;
88-
}
89-
9081
return true;
9182
});
9283

test/functional/services/remote/remote.ts

Lines changed: 13 additions & 6 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,12 +139,8 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
128139
.manage()
129140
.window()
130141
.setRect({ width, height });
131-
await driver.executeScript(
132-
`try { window.sessionStorage.clear(); } catch (err) { console.log('WebDriverError: ' + err) };`
133-
);
134-
await driver.executeScript(
135-
`try { window.localStorage.clear(); } catch (err) { console.log('WebDriverError: ' + err) };`
136-
);
142+
await clearBrowserStorage('sessionStorage');
143+
await clearBrowserStorage('localStorage');
137144
});
138145

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

0 commit comments

Comments
 (0)