From e6a35642fb77ee109ec312d22c4fe332fb828ed4 Mon Sep 17 00:00:00 2001 From: Adam Weeks Date: Mon, 29 Jul 2019 12:05:42 -0400 Subject: [PATCH] fix(samples): add delay before sharing screen --- .../samples/browser-call-with-screenshare/app.js | 11 +++++++++++ .../test/wdio/spec/normal-dialing.js | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/samples/browser-call-with-screenshare/app.js b/packages/node_modules/samples/browser-call-with-screenshare/app.js index 5fc425ccf1e..3f7e7c8305e 100644 --- a/packages/node_modules/samples/browser-call-with-screenshare/app.js +++ b/packages/node_modules/samples/browser-call-with-screenshare/app.js @@ -184,12 +184,15 @@ document.getElementById('share-screen').addEventListener('click', () => { sendShare: true }; + console.info('SHARE-SCREEN: Preparing to share screen via `getMediaStreams`'); activeMeeting.getMediaStreams(mediaSettings) // `[, localShare]` is grabbing index 1 from the mediaSettingsResultsArray // and storing it in a variable called localShare. .then((mediaSettingsResultsArray) => { const [, localShare] = mediaSettingsResultsArray; + console.info('SHARE-SCREEN: Add local share via `updateShare`'); + return activeMeeting.updateShare({ sendShare: true, receiveShare: false, @@ -197,9 +200,17 @@ document.getElementById('share-screen').addEventListener('click', () => { }); }) .then(() => { + console.info('SHARE-SCREEN: Screen successfully added to meeting.'); document.getElementById('screenshare-tracks').innerHTML = '1'; + }) + .catch((e) => { + console.error('SHARE-SCREEN: Unable to share screen, error:'); + console.error(e); }); } + else { + console.error('No active meeting available to share screen.'); + } }); document.getElementById('stop-screen-share').addEventListener('click', () => { diff --git a/packages/node_modules/samples/browser-call-with-screenshare/test/wdio/spec/normal-dialing.js b/packages/node_modules/samples/browser-call-with-screenshare/test/wdio/spec/normal-dialing.js index 6efc80b68e7..03d16bdd4bf 100644 --- a/packages/node_modules/samples/browser-call-with-screenshare/test/wdio/spec/normal-dialing.js +++ b/packages/node_modules/samples/browser-call-with-screenshare/test/wdio/spec/normal-dialing.js @@ -48,7 +48,8 @@ describe('samples', () => { }); it('starts screensharing', () => { - browser.pause(2500); + // Wait for meeting to establish before sharing screen + browser.pause(10000); browserSpock.click('button[title="share screen"]'); browserSpock.waitUntil(() => (browserSpock.getText('#screenshare-tracks') === '1'), 10000, 'Timed-out waiting for screenshare tracks to chage');