From 269bd4ebaf2a216e5c630766361a03e29619de79 Mon Sep 17 00:00:00 2001 From: riya Date: Thu, 15 Feb 2024 15:54:16 +0530 Subject: [PATCH 1/3] sending current session id to test observability --- .../src/insights-handler.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/wdio-browserstack-service/src/insights-handler.ts b/packages/wdio-browserstack-service/src/insights-handler.ts index a8a36b6a777..d0d801fa9e0 100644 --- a/packages/wdio-browserstack-service/src/insights-handler.ts +++ b/packages/wdio-browserstack-service/src/insights-handler.ts @@ -864,12 +864,15 @@ class _InsightsHandler { } private getIntegrationsObject () { + const caps = (this._browser as WebdriverIO.Browser).capabilities as WebdriverIO.Capabilities + const sessionId = (this._browser as WebdriverIO.Browser).sessionId + return { - capabilities: this._platformMeta?.caps, - session_id: this._platformMeta?.sessionId, - browser: this._platformMeta?.browserName, - browser_version: this._platformMeta?.browserVersion, - platform: this._platformMeta?.platformName, + capabilities: caps, + session_id: sessionId, + browser: caps.browserName, + browser_version: caps?.browserVersion, + platform: caps?.platformName, product: this._platformMeta?.product, platform_version: getPlatformVersion(this._userCaps as WebdriverIO.Capabilities) } From 198a35ead6e20c5e25816646d818971a660676af Mon Sep 17 00:00:00 2001 From: riya Date: Wed, 21 Feb 2024 14:25:43 +0530 Subject: [PATCH 2/3] minor fix --- packages/wdio-browserstack-service/src/insights-handler.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/wdio-browserstack-service/src/insights-handler.ts b/packages/wdio-browserstack-service/src/insights-handler.ts index d0d801fa9e0..c9a33e4c71b 100644 --- a/packages/wdio-browserstack-service/src/insights-handler.ts +++ b/packages/wdio-browserstack-service/src/insights-handler.ts @@ -864,13 +864,13 @@ class _InsightsHandler { } private getIntegrationsObject () { - const caps = (this._browser as WebdriverIO.Browser).capabilities as WebdriverIO.Capabilities - const sessionId = (this._browser as WebdriverIO.Browser).sessionId + const caps = (this._browser as WebdriverIO.Browser)?.capabilities as WebdriverIO.Capabilities + const sessionId = (this._browser as WebdriverIO.Browser)?.sessionId return { capabilities: caps, session_id: sessionId, - browser: caps.browserName, + browser: caps?.browserName, browser_version: caps?.browserVersion, platform: caps?.platformName, product: this._platformMeta?.product, From 262e039dbbf0b5ef4e9ac5fcdb7670179b2251c3 Mon Sep 17 00:00:00 2001 From: riya Date: Tue, 27 Feb 2024 14:24:33 +0530 Subject: [PATCH 3/3] unit tests --- .../tests/insights-handler.test.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/wdio-browserstack-service/tests/insights-handler.test.ts b/packages/wdio-browserstack-service/tests/insights-handler.test.ts index f25b5f5a01a..b9def118aac 100644 --- a/packages/wdio-browserstack-service/tests/insights-handler.test.ts +++ b/packages/wdio-browserstack-service/tests/insights-handler.test.ts @@ -617,6 +617,18 @@ describe('getIntegrationsObject', () => { expect(integrationsObject.platform_version).toEqual('some version') }) + it('should fetch latest details', () => { + const existingSessionId = browser.sessionId + const existingOs = browser.capabilities.os + browser.sessionId = 'session-new' + browser.capabilities.os = 'Windows' + const integrationsObject = insightsHandler['getIntegrationsObject']() + expect(integrationsObject.session_id).toEqual('session-new') + expect(integrationsObject.capabilities.os).toEqual('Windows') + browser.sessionId = existingSessionId + browser.capabilities.os = existingOs + }) + afterAll(() => { getPlatformVersionSpy.mockReset() })