Skip to content

Commit b7862ae

Browse files
author
Luca Forstner
committed
Change tests to use exposeFunction
1 parent 7dffe50 commit b7862ae

File tree

2 files changed

+12
-23
lines changed
  • packages/integration-tests/suites/public-api/instrumentation/eventListener-instrumentation-behaviour

2 files changed

+12
-23
lines changed

packages/integration-tests/suites/public-api/instrumentation/eventListener-instrumentation-behaviour/subject.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Simple function event listener
22
const eventListener1 = () => {
3-
// Trigger something that puppeteer can listen to - like console.log
4-
console.log('eventListener1');
3+
testCallback1();
54
};
65

76
// Attach event listener twice
@@ -11,8 +10,7 @@ window.addEventListener('click', eventListener1);
1110
// Event listener that has handleEvent() method: https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#listener
1211
class EventHandlerClass {
1312
handleEvent() {
14-
// Trigger something that puppeteer can listen to - like console.log
15-
console.log('eventListener2');
13+
testCallback2();
1614
}
1715
}
1816

packages/integration-tests/suites/public-api/instrumentation/eventListener-instrumentation-behaviour/test.ts

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,20 @@ sentryTest('should attach the same event listener only once', async ({ getLocalT
66
const url = await getLocalTestPath({ testDir: __dirname });
77
await page.goto(url);
88

9-
const testCompletionPromise = new Promise<void>(resolve => {
10-
let eventListener1Calls = 0;
11-
let eventListener2Calls = 0;
12-
13-
page.on('console', async msg => {
14-
const msgText = msg.text();
9+
let testCallback1Calls = 0;
10+
await page.exposeFunction('testCallback1', () => {
11+
testCallback1Calls = testCallback1Calls + 1;
12+
});
1513

16-
if (msgText === 'eventListener1') {
17-
eventListener1Calls = eventListener1Calls + 1;
18-
} else if (msgText === 'eventListener2') {
19-
eventListener2Calls = eventListener2Calls + 1;
20-
} else if (msgText === 'done') {
21-
expect(eventListener1Calls).toBe(2);
22-
expect(eventListener2Calls).toBe(2);
23-
resolve();
24-
}
25-
});
14+
let testCallback2Calls = 0;
15+
await page.exposeFunction('testCallback2', () => {
16+
testCallback2Calls = testCallback2Calls + 1;
2617
});
2718

28-
// Trigger event listeners twice and signal completion afterwards
19+
// Trigger event listeners twice
2920
await page.evaluate('document.body.click()');
3021
await page.evaluate('document.body.click()');
31-
await page.evaluate('console.log("done")');
3222

33-
return testCompletionPromise;
23+
expect(testCallback1Calls).toBe(2);
24+
expect(testCallback2Calls).toBe(2);
3425
});

0 commit comments

Comments
 (0)