From 4fe91ec0c970c30d68d2172e817b6fc48f6ba443 Mon Sep 17 00:00:00 2001 From: Bernice Date: Thu, 25 Jul 2024 12:20:38 -0700 Subject: [PATCH 01/27] Updated JSON test data files which would be used on Android Test Engine --- apps/teams-test-app/e2e-test-data/app.json | 2 +- .../e2e-test-data/authentication.json | 10 ++--- apps/teams-test-app/e2e-test-data/chat.json | 1 + .../e2e-test-data/conversation.json | 2 +- apps/teams-test-app/e2e-test-data/dialog.json | 3 +- .../e2e-test-data/geoLocation.json | 2 +- .../e2e-test-data/location.json | 37 ++++++++++++++++--- apps/teams-test-app/e2e-test-data/media.json | 1 + .../teams-test-app/e2e-test-data/meeting.json | 30 +++++++++++++++ .../e2e-test-data/meetingRoom.json | 9 ++--- .../e2e-test-data/pages.config.json | 14 ++++--- 11 files changed, 85 insertions(+), 26 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/app.json b/apps/teams-test-app/e2e-test-data/app.json index ae8ebd4b68..defb00c1f4 100644 --- a/apps/teams-test-app/e2e-test-data/app.json +++ b/apps/teams-test-app/e2e-test-data/app.json @@ -1,6 +1,6 @@ { "name": "App", - "platforms": "*", + "platforms": ["iOS","WEB"], "testCases": [ { "title": "openLink API Call - Success", diff --git a/apps/teams-test-app/e2e-test-data/authentication.json b/apps/teams-test-app/e2e-test-data/authentication.json index b0b3e85209..4816e740df 100644 --- a/apps/teams-test-app/e2e-test-data/authentication.json +++ b/apps/teams-test-app/e2e-test-data/authentication.json @@ -14,7 +14,7 @@ "title": "getUser API Call - Success", "version": "2.0.0-beta.2", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_getUser", "expectedTestAppValue": "Success: {\"oid\":\"mockoid\",\"tid\":\"mocktid\",\"upn\":\"mockupn\",\"loginHint\":\"mockLoginHint\",\"displayName\":\"mockName\",\"dataResidency\":\"public\"}" }, @@ -25,7 +25,7 @@ "web": "<=3.1.0" }, "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_getUser", "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": false}"]], "expectedTestAppValue": "Error: Error: Error returned, code = 500, message = App does not have the required permissions for this operation" @@ -37,7 +37,7 @@ "web": ">3.1.0" }, "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_getUser", "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": false, \"isMicrosoftOwned\": false}"]], "expectedTestAppValue": "Error: Error: Error returned, code = 500, message = App does not have the required permissions for this operation" @@ -49,7 +49,7 @@ "web": ">3.1.0" }, "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_getUser", "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": true, \"isMicrosoftOwned\": false}"]], "expectedTestAppValue": "{\"oid\":\"mockoid\",\"tid\":\"mocktid\",\"upn\":\"mockupn\",\"loginHint\":\"mockLoginHint\",\"displayName\":\"mockName\",\"dataResidency\":\"public\"}" @@ -61,7 +61,7 @@ "web": ">3.1.0" }, "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_getUser", "testUrlParams": [["appDefOverrides", "{\"isFullTrustApp\": true, \"isMicrosoftOwned\": true}"]], "expectedTestAppValue": "{\"oid\":\"mockoid\",\"tid\":\"mocktid\",\"upn\":\"mockupn\",\"loginHint\":\"mockLoginHint\",\"displayName\":\"mockName\",\"dataResidency\":\"public\"}" diff --git a/apps/teams-test-app/e2e-test-data/chat.json b/apps/teams-test-app/e2e-test-data/chat.json index b1e073099b..6d1bdd83e0 100644 --- a/apps/teams-test-app/e2e-test-data/chat.json +++ b/apps/teams-test-app/e2e-test-data/chat.json @@ -46,6 +46,7 @@ "title": "openChat2 API Call - Success", "type": "callResponse", "version": ">2.2.0 && <=2.17.0", + "platformsExcluded": ["Android"], "boxSelector": "#box_openChat2", "inputValue": { "user": ["testUpn"], diff --git a/apps/teams-test-app/e2e-test-data/conversation.json b/apps/teams-test-app/e2e-test-data/conversation.json index 295018fef3..398c52ef2f 100644 --- a/apps/teams-test-app/e2e-test-data/conversation.json +++ b/apps/teams-test-app/e2e-test-data/conversation.json @@ -100,7 +100,7 @@ { "title": "openConversation API Call - with closeConversation", "version": "2.0.0-beta.2", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_openConversation", "type": "registerAndRaiseEvent", "inputValue": { diff --git a/apps/teams-test-app/e2e-test-data/dialog.json b/apps/teams-test-app/e2e-test-data/dialog.json index 2832c2bda0..af2443ba69 100644 --- a/apps/teams-test-app/e2e-test-data/dialog.json +++ b/apps/teams-test-app/e2e-test-data/dialog.json @@ -1,6 +1,6 @@ { "name": "Dialog", - "platforms": "Web", + "platforms": ["Web","Android"], "checkIsSupported": { "domElementName": "checkCapabilityDialog" }, @@ -8,6 +8,7 @@ { "title": "dialogResize API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "testUrlParams": [["frameContext", "task"]], "boxSelector": "#box_dialogResize", "inputValue": { diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index ec4cfc9519..91dffb6177 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -1,6 +1,6 @@ { "name": "GeoLocation", - "platforms": "Web", + "platforms": ["Web","Android"], "version": ">=2.1.0", "checkIsSupported": { "capabilityName": "GeoLocation", diff --git a/apps/teams-test-app/e2e-test-data/location.json b/apps/teams-test-app/e2e-test-data/location.json index 9aeaacf5ee..622d3dfa0c 100644 --- a/apps/teams-test-app/e2e-test-data/location.json +++ b/apps/teams-test-app/e2e-test-data/location.json @@ -7,7 +7,7 @@ { "title": "getLocation API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_getLocation", "requestPermissionBeforeThisCall": { "boxSelector": "#box_requestGeoLocationPermission", @@ -17,10 +17,23 @@ "expectedAlertValue": "location.map.chooseLocation is called.", "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2,\"timestamp\":200}" }, + { + "title": "getLocation API Call - Success", + "type": "callResponse", + "platformsExcluded": ["iOS","Web"], + "boxSelector": "#box_getLocation", + "requestPermissionBeforeThisCall": { + "boxSelector": "#box_requestGeoLocationPermission", + "consentPermission": true + }, + "inputValue": { "allowChooseLocation": true }, + "expectedAlertValue": "location.map.chooseLocation is called.", + "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2.01,\"timestamp\":200}" + }, { "title": "showLocation API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","ANDROID"], "boxSelector": "#box_showLocation", "requestPermissionBeforeThisCall": { "boxSelector": "#box_requestGeoLocationPermission", @@ -29,7 +42,7 @@ "inputValue": { "latitude": 51.50735, "longitude": -0.127758, - "accuracy": 2, + "accuracy": 2.01, "timestamp": 200 }, "expectedAlertValue": "location.map.showLocation called with ##JSON_INPUT_VALUE##", @@ -38,7 +51,7 @@ { "title": "getLocation API Call - Success", "type": "callResponse", - "platformsExcluded": ["Web"], + "platformsExcluded": ["Web","Android"], "boxSelector": "#box_getLocation", "requestPermissionBeforeThisCall": { "boxSelector": "#box_requestGeoLocationPermission", @@ -49,6 +62,20 @@ "expectedAlertValue": "location.map.chooseLocation is called.", "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2,\"timestamp\":200}" }, + { + "title": "getLocation API Call - Success", + "type": "callResponse", + "platformsExcluded": ["Web","iOS"], + "boxSelector": "#box_getLocation", + "requestPermissionBeforeThisCall": { + "boxSelector": "#box_requestGeoLocationPermission", + "consentPermission": "Allow", + "expectedOutput": "true" + }, + "inputValue": { "allowChooseLocation": true }, + "expectedAlertValue": "location.map.chooseLocation is called.", + "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2.01,\"timestamp\":200}" + }, { "title": "showLocation API Call - Success", "type": "callResponse", @@ -62,7 +89,7 @@ "inputValue": { "latitude": 51.50735, "longitude": -0.127758, - "accuracy": 2, + "accuracy": 2.01, "timestamp": 200 }, "expectedAlertValue": "location.map.showLocation called with ##JSON_INPUT_VALUE##", diff --git a/apps/teams-test-app/e2e-test-data/media.json b/apps/teams-test-app/e2e-test-data/media.json index 2c709676ab..5dd265c37d 100644 --- a/apps/teams-test-app/e2e-test-data/media.json +++ b/apps/teams-test-app/e2e-test-data/media.json @@ -61,6 +61,7 @@ { "title": "viewImagesWithUrls API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_viewImagesWithUrls", "inputValue": "first, second", diff --git a/apps/teams-test-app/e2e-test-data/meeting.json b/apps/teams-test-app/e2e-test-data/meeting.json index 2742b772dc..26d1dc104b 100644 --- a/apps/teams-test-app/e2e-test-data/meeting.json +++ b/apps/teams-test-app/e2e-test-data/meeting.json @@ -6,6 +6,7 @@ { "title": "getIncomingClientAudioState API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getIncomingClientAudioState", "expectedAlertValue": "getIncomingClientAudioState called", "expectedTestAppValue": "true" @@ -13,6 +14,7 @@ { "title": "toggleIncomingClientAudio API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_toggleIncomingClientAudio", "expectedAlertValue": "toggleIncomingClientAudio called", "expectedTestAppValue": "false" @@ -21,6 +23,7 @@ "title": "getMeetingDetails API Call - Success", "version": "<=2.22.0", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getMeetingDetails", "expectedAlertValue": "getMeetingDetails called", "expectedTestAppValue": "{\"details\":{\"id\":\"testDetailsId\",\"scheduledStartTime\":\"testStartTime\",\"scheduledEndTime\":\"testEndTime\",\"joinUrl\":\"testJoinUrl\",\"title\":\"testTitle\",\"type\":\"Unknown\"},\"conversation\":{\"id\":\"testConversationId\"},\"organizer\":{\"id\":\"testOrganizerId\",\"tenantId\":\"testTenantId\"}}" @@ -37,6 +40,7 @@ "title": "getMeetingDetailsVerbose API Call - Success", "version": ">2.22.0", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getMeetingDetailsVerbose", "expectedAlertValue": "getMeetingDetails called with shouldGetVerboseDetails: true", "expectedTestAppValue": "{\"details\":{\"scheduledStartTime\":\"testStartTime\",\"joinUrl\":\"testJoinUrl\",\"type\":\"oneOnOneCall\",\"originalCaller\":\"testCallerId\",\"dialedEntity\":\"testDnis\",\"trackingId\":\"testTrackingId\"},\"conversation\":{\"id\":\"testConversationId\"},\"organizer\":{\"id\":\"testOrganizerId\",\"tenantId\":\"testTenantId\"}}" @@ -51,6 +55,7 @@ { "title": "getLiveStreamState API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getLiveStreamState", "expectedAlertValue": "getLiveStreamState called", "expectedTestAppValue": "true" @@ -58,6 +63,7 @@ { "title": "requestStartLiveStreaming API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_requestStartLiveStreaming", "inputValue": { "streamUrl": "https://www.bing.com", @@ -68,12 +74,14 @@ { "title": "requestStopLiveStreaming API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_requestStopLiveStreaming", "expectedAlertValue": "requestStopLiveStreaming called" }, { "title": "registerLiveStreamChangedHandler API Call - Handler", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.0.0-beta.2", "boxSelector": "#box_registerLiveStreamChangedHandler", "eventName": "liveStreamChanged", @@ -89,6 +97,7 @@ { "title": "registerLiveStreamChangedHandler API Call - Handler", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_registerLiveStreamChangedHandler", "eventName": "liveStreamChanged", @@ -104,6 +113,7 @@ { "title": "registerRaiseHandStateChangedHandler API Call - Handler - Success", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.0.0", "boxSelector": "#box_registerRaiseHandStateChangedHandler", "eventName": "raiseHandStateChanged", @@ -117,6 +127,7 @@ { "title": "registerRaiseHandStateChangedHandler API Call - Handler - Error", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.0.0", "boxSelector": "#box_registerRaiseHandStateChangedHandler", "eventName": "raiseHandStateChanged", @@ -134,6 +145,7 @@ { "title": "registerMeetingReactionReceivedHandler API Call - Handler - Success", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.0.0", "boxSelector": "#box_registerMeetingReactionReceivedHandler", "eventName": "meetingReactionReceived", @@ -145,6 +157,7 @@ { "title": "registerMeetingReactionReceivedHandler API Call - Handler - Error", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.0.0", "boxSelector": "#box_registerMeetingReactionReceivedHandler", "eventName": "meetingReactionReceived", @@ -159,6 +172,7 @@ { "title": "registerSpeakingStateChangedHandler API Call - Handler - Success", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.0.0", "boxSelector": "#box_registerSpeakingStateChangedHandler", "eventName": "speakingStateChanged", @@ -170,6 +184,7 @@ { "title": "registerSpeakingStateChangedHandler API Call - Handler - Error", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.1.0", "boxSelector": "#box_registerSpeakingStateChangedHandler", "eventName": "speakingStateChanged", @@ -198,6 +213,7 @@ { "title": "shareAppContentToStage API Call (TJS <2.19.0, host SDK>=2.8.0) - Success", "type": "callResponse", + "platformsExcluded":["Android"], "version": "<2.19.0", "hostSdkVersion": { "web": ">=2.8.0" @@ -212,6 +228,7 @@ { "title": "shareAppContentToStage API Call (TJS >=2.19.0, host SDK>=2.8.0) - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": ">=2.19.0", "hostSdkVersion": { "web": ">=2.8.0" @@ -226,6 +243,7 @@ { "title": "shareAppContentToStage API Call with shareOptions (host sdk<2.8.0) - Success", "type": "callResponse", + "platformsExcluded":["Android"], "hostSdkVersion": { "web": "<2.8.0" }, @@ -242,6 +260,7 @@ { "title": "shareAppContentToStage API Call with shareOptions (TJS<2.19.0, host SDK>=2.8.0) - Success", "type": "callResponse", + "platformsExcluded":["Android"], "version": "<2.19.0", "hostSdkVersion": { "web": ">=2.8.0" @@ -260,6 +279,7 @@ "title": "shareAppContentToStage API Call with shareOptions (TJS>=2.19.0, host SDK>=2.8.0) - Success", "type": "callResponse", "version": ">=2.19.0", + "platformsExcluded":["Android"], "hostSdkVersion": { "web": ">=2.8.0" }, @@ -276,6 +296,7 @@ { "title": "getAppContentStageSharingCapabilities API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getAppContentStageSharingCapabilities", "expectedAlertValue": "getAppContentStageSharingCapabilities called", "expectedTestAppValue": "getAppContentStageSharingCapabilities() succeeded: {\"doesAppHaveSharePermission\":true}" @@ -283,6 +304,7 @@ { "title": "stopSharingAppContentToStage API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_stopSharingAppContentToStage", "expectedAlertValue": "stopSharingAppContentToStage called", "expectedTestAppValue": "stopSharingAppContentToStage() succeeded: true" @@ -290,6 +312,7 @@ { "title": "getAppContentStageSharingState API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getAppContentStageSharingState", "expectedAlertValue": "getAppContentStageSharingState called", "expectedTestAppValue": "getAppContentStageSharingState() succeeded: {\"isAppSharing\":true}" @@ -297,6 +320,7 @@ { "title": "requestAppAudioHandling API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": ">2.7.1", "boxSelector": "#box_requestAppAudioHandling", "inputValue": { @@ -308,6 +332,7 @@ { "title": "requestAppAudioHandling API Call - register audioDeviceSelectionChanged Handler - Success", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.17.0", "hostSdkVersion": { "web": ">=2.8.0" @@ -328,6 +353,7 @@ { "title": "requestAppAudioHandling API Call - register audioDeviceSelectionChanged Handler - Error", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "version": ">2.17.0", "hostSdkVersion": { "web": ">=2.8.0" @@ -346,6 +372,7 @@ { "title": "updateMicState API Call (<=2.20.0) - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": ">2.7.1 && <=2.20.0", "boxSelector": "#box_updateMicState", "inputValue": { @@ -357,6 +384,7 @@ { "title": "updateMicState API Call (>2.20.0) - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": ">2.20.0", "boxSelector": "#box_updateMicState", "inputValue": { @@ -368,6 +396,7 @@ { "title": "joinMeeting API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": ">2.20.0", "hostSdkVersion": { "web": ">2.12.0" @@ -383,6 +412,7 @@ { "title": "joinMeeting API Call - Error", "type": "callResponse", + "platformsExcluded": ["Android"], "version": ">2.20.0", "hostSdkVersion": { "web": ">2.12.0" diff --git a/apps/teams-test-app/e2e-test-data/meetingRoom.json b/apps/teams-test-app/e2e-test-data/meetingRoom.json index ed07262aaa..e29e9c8103 100644 --- a/apps/teams-test-app/e2e-test-data/meetingRoom.json +++ b/apps/teams-test-app/e2e-test-data/meetingRoom.json @@ -18,19 +18,16 @@ "type": "callResponse", "version": ">2.0.0-beta.2", "boxSelector": "#box_sendCommandToPairedMeetingRoom", - "inputValue": { - "commandName": "someCommandName" - }, + "inputValue": "someCommandName", "expectedAlertValue": "sendCommandToPairedMeetingRoom is called with ##JSON_INPUT_VALUE##" }, { "title": "sendCommandToPairedMeetingRoom API Call - Success", "type": "callResponse", "version": "2.0.0-beta.2", + "platformsExcluded": ["Android"], "boxSelector": "#box_sendCommandToPairedMeetingRoom", - "inputValue": { - "commandName": "someCommandName" - }, + "inputValue": "someCommandName", "expectedAlertValue": "sendCommandToPairedMeetingRoom is called with \"{\\\"commandName\\\":\\\"someCommandName\\\"}\"" }, { diff --git a/apps/teams-test-app/e2e-test-data/pages.config.json b/apps/teams-test-app/e2e-test-data/pages.config.json index a2e3684bbd..14d7dc2cb7 100644 --- a/apps/teams-test-app/e2e-test-data/pages.config.json +++ b/apps/teams-test-app/e2e-test-data/pages.config.json @@ -32,6 +32,7 @@ { "title": "setValidityState API Call - Success - true", "type": "callResponse", + "platformsExcluded":["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_config_setValidityState", "inputValue": true, @@ -49,6 +50,7 @@ { "title": "setValidityState API Call - Success - false", "type": "callResponse", + "platformsExcluded":["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_config_setValidityState", "inputValue": false, @@ -58,7 +60,7 @@ { "title": "settings.save event without registration", "type": "raiseEvent", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "eventName": "settings.save", "eventData": { "webhookUrl": "sampleWebhook" @@ -68,14 +70,14 @@ { "title": "settings.remove event without registration", "type": "raiseEvent", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "eventName": "settings.remove", "expectedAlertValue": "onRemoveSuccess called" }, { "title": "registerOnSaveHandler API Call - Handler", "type": "registerAndRaiseEvent", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_config_registerOnSaveHandler", "eventName": "settings.save", "eventData": { @@ -87,7 +89,7 @@ { "title": "registerOnRemoveHandler API Call - Handler", "type": "registerAndRaiseEvent", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_config_registerOnRemoveHandler", "eventName": "settings.remove", "expectedAlertValue": "onRemoveSuccess called", @@ -97,7 +99,7 @@ "title": "registerOnRemoveHandler API Call - Handler Failure", "type": "registerAndRaiseEvent", "version": ">2.0.0", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_config_registerOnRemoveHandlerFailure", "eventName": "settings.remove", "eventData": null, @@ -108,7 +110,7 @@ "title": "registerChangeConfigsHandler API Call - Handler", "type": "registerAndRaiseEvent", "version": ">2.0.0-beta.0", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "testUrlParams": [["frameContext", "content"]], "boxSelector": "#box_config_registerChangeConfigsHandler", "eventName": "changeSettings", From 3e1eacea9a1e73871143915180321b32867ceea5 Mon Sep 17 00:00:00 2001 From: Bernice Date: Thu, 25 Jul 2024 12:55:15 -0700 Subject: [PATCH 02/27] Updated GeoLocation.json --- apps/teams-test-app/e2e-test-data/geoLocation.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index 91dffb6177..87cf181cdd 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -39,6 +39,18 @@ "expectedAlertValue": ["getCurrentLocation is called"], "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2,\"timestamp\":200}" }, + { + "title": "getCurrentLocation API Call - Success", + "type": "callResponse", + "platformsExcluded": ["Web"], + "boxSelector": "#box_getCurrentLocation", + "requestPermissionBeforeThisCall": { + "boxSelector": "#box_requestGeoLocationPermission", + "consentPermission": true + }, + "expectedAlertValue": ["getCurrentLocation is called"], + "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2,\"timestamp\":200}" + }, { "title": "getCurrentLocation API Call - Failure", "type": "callResponse", From 4221d3baf3986fbdc61f27612cf2057cdf8c49b6 Mon Sep 17 00:00:00 2001 From: BEChiaha Date: Thu, 25 Jul 2024 15:14:06 -0700 Subject: [PATCH 03/27] Update apps/teams-test-app/e2e-test-data/app.json Co-authored-by: Trevor Harris --- apps/teams-test-app/e2e-test-data/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/app.json b/apps/teams-test-app/e2e-test-data/app.json index defb00c1f4..3589f71e4f 100644 --- a/apps/teams-test-app/e2e-test-data/app.json +++ b/apps/teams-test-app/e2e-test-data/app.json @@ -1,6 +1,6 @@ { "name": "App", - "platforms": ["iOS","WEB"], + "platforms": ["iOS","Web"], "testCases": [ { "title": "openLink API Call - Success", From 08943f5cf0eb34de5d501a5a43927ec9b2df5a9d Mon Sep 17 00:00:00 2001 From: BEChiaha Date: Thu, 25 Jul 2024 15:15:08 -0700 Subject: [PATCH 04/27] Update apps/teams-test-app/e2e-test-data/location.json Co-authored-by: Trevor Harris --- apps/teams-test-app/e2e-test-data/location.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/location.json b/apps/teams-test-app/e2e-test-data/location.json index 622d3dfa0c..76de7c0e72 100644 --- a/apps/teams-test-app/e2e-test-data/location.json +++ b/apps/teams-test-app/e2e-test-data/location.json @@ -33,7 +33,7 @@ { "title": "showLocation API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS","ANDROID"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_showLocation", "requestPermissionBeforeThisCall": { "boxSelector": "#box_requestGeoLocationPermission", From 789a6d5bf8a2104e34b22f5ab133fefcf9133878 Mon Sep 17 00:00:00 2001 From: Bernice Date: Thu, 1 Aug 2024 23:03:25 -0700 Subject: [PATCH 05/27] Final update for JSON test files for Android test engine --- apps/teams-test-app/e2e-test-data/app.json | 15 ++++++++------- apps/teams-test-app/e2e-test-data/chat.json | 1 + .../e2e-test-data/conversation.json | 4 ++-- apps/teams-test-app/e2e-test-data/dialog.json | 1 + apps/teams-test-app/e2e-test-data/files.json | 13 ++++++++----- .../teams-test-app/e2e-test-data/geoLocation.json | 3 ++- apps/teams-test-app/e2e-test-data/media.json | 11 ++++++++++- .../teams-test-app/e2e-test-data/meetingRoom.json | 2 +- .../e2e-test-data/secondaryBrowser.json | 2 +- 9 files changed, 34 insertions(+), 18 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/app.json b/apps/teams-test-app/e2e-test-data/app.json index defb00c1f4..ddfa0af4a1 100644 --- a/apps/teams-test-app/e2e-test-data/app.json +++ b/apps/teams-test-app/e2e-test-data/app.json @@ -1,12 +1,12 @@ { "name": "App", - "platforms": ["iOS","WEB"], + "platforms": ["*"], "testCases": [ { "title": "openLink API Call - Success", "type": "callResponse", "boxSelector": "#box_executeDeepLink2", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "inputValue": "https://bing.com", "expectedWindowOpenTarget": "https://bing.com" }, @@ -14,7 +14,7 @@ "title": "openLink startCall API Call - Success", "type": "callResponse", "boxSelector": "#box_executeDeepLink2", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "inputValue": "https://teams.microsoft.com/l/call/0/0?users=testUser1,testUser2&withVideo=true&source=test", "expectedAlertValue": "startCall called with {\"targets\":[\"testUser1\",\"testUser2\"],\"requestedModalities\":[\"audio\",\"video\"],\"source\":\"test\"}", "expectedTestAppValue": "Completed" @@ -23,7 +23,7 @@ "title": "openLink openAppInstallDialog API Call - Success", "type": "callResponse", "boxSelector": "#box_executeDeepLink2", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "inputValue": "https://teams.microsoft.com/l/app/testAppId", "expectedAlertValue": "openAppInstallDialog called with {\"appId\":\"testAppId\"}", "expectedTestAppValue": "Completed" @@ -39,7 +39,7 @@ { "title": "openLink composeMeeting API Call - Success", "type": "callResponse", - "boxSelector": "#box_executeDeepLink2", + "boxSelector": "#box_e.jxecuteDeepLink2", "inputValue": "https://teams.microsoft.com/l/meeting/new?subject=testSubject&attendees=testAttendee1,testAttendee2&startTime=testStartTime&endTime=testEndTime&content=testContent", "expectedAlertValue": "composeMeeting called with {\"attendees\":[\"testAttendee1\",\"testAttendee2\"],\"startTime\":\"testStartTime\",\"endTime\":\"testEndTime\",\"subject\":\"testSubject\",\"content\":\"testContent\"}", "expectedTestAppValue": "Completed" @@ -66,7 +66,7 @@ "title": "openLink stageView.open API Call with thread id - Success", "type": "callResponse", "boxSelector": "#box_executeDeepLink2", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "inputValue": "https://teams.microsoft.com/l/stage/testAppId/0?context=%7B%22contentUrl%22%3A%22testContentUrl%22%2C%22websiteUrl%22%3A%22testWebsiteUrl%22%2C%22title%22%3A%22TestTitle%22%2C%22threadId%22%3A%22TestThreadId%22%7D", "expectedAlertValue": "stageView.open called with {\"appId\":\"testAppId\",\"contentUrl\":\"testContentUrl\",\"threadId\":\"TestThreadId\",\"title\":\"TestTitle\",\"websiteUrl\":\"testWebsiteUrl\"}", "expectedTestAppValue": "Completed" @@ -75,7 +75,7 @@ "title": "openLink stageView.open API Call without thread id - Success", "type": "callResponse", "boxSelector": "#box_executeDeepLink2", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "inputValue": "https://teams.microsoft.com/l/stage/testAppId/0?context=%7B%22contentUrl%22%3A%22testContentUrl%22%2C%22websiteUrl%22%3A%22testWebsiteUrl%22%2C%22title%22%3A%22TestTitle%22%7D", "expectedAlertValue": "stageView.open called with {\"appId\":\"testAppId\",\"contentUrl\":\"testContentUrl\",\"title\":\"TestTitle\",\"websiteUrl\":\"testWebsiteUrl\"}", "expectedTestAppValue": "Completed" @@ -83,6 +83,7 @@ { "title": "openLink appLink domain doesn't match API Call - executeDeepLink called", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_executeDeepLink2", "inputValue": "https://contoso.com/l/entity/testAppId/tasklist123", "expectedWindowOpenTarget": "https://contoso.com/l/entity/testAppId/tasklist123", diff --git a/apps/teams-test-app/e2e-test-data/chat.json b/apps/teams-test-app/e2e-test-data/chat.json index 6d1bdd83e0..c54f9b76aa 100644 --- a/apps/teams-test-app/e2e-test-data/chat.json +++ b/apps/teams-test-app/e2e-test-data/chat.json @@ -9,6 +9,7 @@ { "title": "openChat API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": ">2.0.0-beta.3 && <=2.17.0", "boxSelector": "#box_openChat", "inputValue": { diff --git a/apps/teams-test-app/e2e-test-data/conversation.json b/apps/teams-test-app/e2e-test-data/conversation.json index 398c52ef2f..be31381229 100644 --- a/apps/teams-test-app/e2e-test-data/conversation.json +++ b/apps/teams-test-app/e2e-test-data/conversation.json @@ -23,7 +23,7 @@ "title": "getChatMembers API Call - Success", "type": "callResponse", "version": ">2.0.0-beta.3", - "platformsExcluded": ["Web"], + "platformsExcluded": ["Web","Android"], "boxSelector": "#box_getChatMembers", "expectedAlertValue": "getChatMembers called", "expectedTestAppValue": "{\"members\":[{\"principalName\":\"TestUser\"}]}" @@ -54,7 +54,7 @@ { "title": "openConversation API Call - with startConversation", "version": "2.0.0-beta.2", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_openConversation", "type": "registerAndRaiseEvent", "inputValue": { diff --git a/apps/teams-test-app/e2e-test-data/dialog.json b/apps/teams-test-app/e2e-test-data/dialog.json index af2443ba69..75f4672a91 100644 --- a/apps/teams-test-app/e2e-test-data/dialog.json +++ b/apps/teams-test-app/e2e-test-data/dialog.json @@ -20,6 +20,7 @@ { "title": "dialogSubmit API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "testUrlParams": [["frameContext", "task"]], "boxSelector": "#box_dialogSubmitWithInput", "inputValue": { diff --git a/apps/teams-test-app/e2e-test-data/files.json b/apps/teams-test-app/e2e-test-data/files.json index a822df952a..3da140a834 100644 --- a/apps/teams-test-app/e2e-test-data/files.json +++ b/apps/teams-test-app/e2e-test-data/files.json @@ -28,6 +28,7 @@ { "title": "openFilePreview API Call - Success", "type": "callResponse", + "platformsExcluded":["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_openFilePreview", "inputValue": { @@ -59,7 +60,7 @@ { "title": "getCloudStorageFolders API Call - Failure (Not Full Trust)", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "version": ">2.0.0-beta.5", "boxSelector": "#box_getCloudStorageFolders2", "inputValue": "testChannelId", @@ -69,6 +70,7 @@ { "title": "getCloudStorageFolders API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_getCloudStorageFolders", "inputValue": "testChannelId", @@ -87,6 +89,7 @@ { "title": "addCloudStorageFolder API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_addCloudStorageFolder", "inputValue": "testChannelId", @@ -115,7 +118,7 @@ "title": "copyMoveFiles API Call - Success", "version": ">2.0.0-beta.2", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_copyMoveFiles", "inputValue": { "selectedFiles": [ @@ -147,7 +150,7 @@ { "title": "openCloudStorageFile API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_openCloudStorageFile", "inputValue": { "file": { @@ -166,7 +169,7 @@ { "title": "getExternalProviders API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "version": ">2.0.0", "boxSelector": "#box_getExternalProviders", "checkboxState": true, @@ -176,7 +179,7 @@ { "title": "getCloudStorageFolderContents API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "version": ">2.0.0-beta.2", "boxSelector": "#box_getCloudStorageFolderContents", "inputValue": { diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index 87cf181cdd..632249a497 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -31,13 +31,14 @@ { "title": "getCurrentLocation API Call - Success", "type": "callResponse", + "platformsExcluded": ["Web"], "boxSelector": "#box_getCurrentLocation", "requestPermissionBeforeThisCall": { "boxSelector": "#box_requestGeoLocationPermission", "consentPermission": true }, "expectedAlertValue": ["getCurrentLocation is called"], - "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2,\"timestamp\":200}" + "expectedTestAppValue": "{\"latitude\":51.50735,\"longitude\":-0.127758,\"accuracy\":2.01,\"timestamp\":200}" }, { "title": "getCurrentLocation API Call - Success", diff --git a/apps/teams-test-app/e2e-test-data/media.json b/apps/teams-test-app/e2e-test-data/media.json index 5dd265c37d..8e7efe1423 100644 --- a/apps/teams-test-app/e2e-test-data/media.json +++ b/apps/teams-test-app/e2e-test-data/media.json @@ -1,6 +1,6 @@ { "name": "Media", - "platforms": "Web", + "platforms": ["Web","Android"], "testCases": [ { "title": "selectMedia API Call - Success", @@ -24,11 +24,20 @@ { "title": "getMedia API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getMedia", "inputValue": {}, "expectedAlertValue": ["selectMedia called with ##JSON_INPUT_VALUE##", "getMedia called with \"ABCDEFGHIJKL\""], "expectedTestAppValue": "Received Blob (length: 74163)" }, + { + "title": "getMedia API Call - Success", + "type": "callResponse", + "platformsExcluded": ["Web","iOS"], + "boxSelector": "#box_getMedia", + "inputValue": {}, + "expectedTestAppValue": "{\"errorCode\":500,\"message\":\"An internal server error occurred\"}" + }, { "title": "viewImagesWithIds API Call - Success", "type": "callResponse", diff --git a/apps/teams-test-app/e2e-test-data/meetingRoom.json b/apps/teams-test-app/e2e-test-data/meetingRoom.json index e29e9c8103..1eb0c8a40e 100644 --- a/apps/teams-test-app/e2e-test-data/meetingRoom.json +++ b/apps/teams-test-app/e2e-test-data/meetingRoom.json @@ -1,6 +1,6 @@ { "name": "MeetingRoom", - "platforms": "Web", + "platforms": ["Web","Android"], "version": ">2.0.0-beta.0", "checkIsSupported": { "expectedOutput": "MeetingRoom is not supported" diff --git a/apps/teams-test-app/e2e-test-data/secondaryBrowser.json b/apps/teams-test-app/e2e-test-data/secondaryBrowser.json index ea541bcde4..88cdd3ea66 100644 --- a/apps/teams-test-app/e2e-test-data/secondaryBrowser.json +++ b/apps/teams-test-app/e2e-test-data/secondaryBrowser.json @@ -1,7 +1,7 @@ { "name": "SecondaryBrowser", "version": ">=2.12.0", - "platforms": "iOS", + "platforms": ["iOS", "Android"], "checkIsSupported": {}, "testCases": [ { From ee86dc7c0b88cf9aa4bf57383074354248dad800 Mon Sep 17 00:00:00 2001 From: Bernice Date: Thu, 1 Aug 2024 23:23:26 -0700 Subject: [PATCH 06/27] Made changes to test app to allow for sorted output --- .../src/components/privateApis/FilesAPIs.tsx | 62 ++++++++++++------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx index b092e17318..6d24320ece 100644 --- a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx +++ b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx @@ -80,31 +80,47 @@ const GetCloudStorageFolders = (): React.ReactElement => defaultInput: '"channelId1"', }); -const AddCloudStorageFolder = (): React.ReactElement => - ApiWithTextInput({ - name: 'addCloudStorageFolder2', - title: 'Add Cloud Storage Folders', - onClick: { - validateInput: (input) => { - if (!input && typeof input !== 'string') { - throw new Error('input is required and it has be a string.'); - } - }, - submit: async (input, setResult) => { - const callback = (error: SdkError, isFolderAdded: boolean, folders: files.CloudStorageFolder[]): void => { - if (error) { - setResult(JSON.stringify(error)); - } else { - setResult(JSON.stringify({ isFolderAdded, folders })); + const AddCloudStorageFolder = (): React.ReactElement => + ApiWithTextInput({ + name: 'addCloudStorageFolder2', + title: 'Add Cloud Storage Folders', + onClick: { + validateInput: (input) => { + if (!input && typeof input !== 'string') { + throw new Error('input is required and it has to be a string.'); } - }; - - await files.addCloudStorageFolder(input, callback); - return ''; + }, + submit: async (input, setResult) => { + // Sort the input value + const sortedInput = input + .split(',') + .map((item) => item.trim()) + .sort() + .join(','); + + const callback = (error: SdkError, isFolderAdded: boolean, folders: files.CloudStorageFolder[]): void => { + if (error) { + setResult(JSON.stringify(error)); + } else { + const result = { folders, isFolderAdded }; + + // Sort the result object properties before returning + const sortedResult = Object.keys(result) + .sort() + .reduce((acc, key) => { + acc[key] = result[key]; + return acc; + }, {}); + setResult(JSON.stringify(sortedResult)); + } + }; + + await files.addCloudStorageFolder(sortedInput, callback); + return ''; + }, }, - }, - defaultInput: '"channelId1"', - }); + defaultInput: '"channelId1"', + });; interface DeleteCloudStorageParams { channelId: string; From 26d3f51d588b28081d9528e0732f5737208635c6 Mon Sep 17 00:00:00 2001 From: Bernice Date: Fri, 2 Aug 2024 07:13:10 -0700 Subject: [PATCH 07/27] Took off unecessary input sorting --- .../src/components/privateApis/FilesAPIs.tsx | 72 +++++++++---------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx index 6d24320ece..959b4a8134 100644 --- a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx +++ b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx @@ -80,47 +80,41 @@ const GetCloudStorageFolders = (): React.ReactElement => defaultInput: '"channelId1"', }); - const AddCloudStorageFolder = (): React.ReactElement => - ApiWithTextInput({ - name: 'addCloudStorageFolder2', - title: 'Add Cloud Storage Folders', - onClick: { - validateInput: (input) => { - if (!input && typeof input !== 'string') { - throw new Error('input is required and it has to be a string.'); +const AddCloudStorageFolder = (): React.ReactElement => + ApiWithTextInput({ + name: 'addCloudStorageFolder2', + title: 'Add Cloud Storage Folders', + onClick: { + validateInput: (input) => { + if (!input && typeof input !== 'string') { + throw new Error('input is required and it has to be a string.'); + } + }, + submit: async (input, setResult) => { + + const callback = (error: SdkError, isFolderAdded: boolean, folders: files.CloudStorageFolder[]): void => { + if (error) { + setResult(JSON.stringify(error)); + } else { + const result = { folders, isFolderAdded }; + + // Sort the result object properties before returning + const sortedResult = Object.keys(result) + .sort() + .reduce((acc, key) => { + acc[key] = result[key]; + return acc; + }, {}); + setResult(JSON.stringify(sortedResult)); } - }, - submit: async (input, setResult) => { - // Sort the input value - const sortedInput = input - .split(',') - .map((item) => item.trim()) - .sort() - .join(','); - - const callback = (error: SdkError, isFolderAdded: boolean, folders: files.CloudStorageFolder[]): void => { - if (error) { - setResult(JSON.stringify(error)); - } else { - const result = { folders, isFolderAdded }; - - // Sort the result object properties before returning - const sortedResult = Object.keys(result) - .sort() - .reduce((acc, key) => { - acc[key] = result[key]; - return acc; - }, {}); - setResult(JSON.stringify(sortedResult)); - } - }; - - await files.addCloudStorageFolder(sortedInput, callback); - return ''; - }, + }; + + await files.addCloudStorageFolder(input, callback); + return ''; }, - defaultInput: '"channelId1"', - });; + }, + defaultInput: '"channelId1"', + }); interface DeleteCloudStorageParams { channelId: string; From 4ebd48112398cdff84c3f3f259d9d338452a3d62 Mon Sep 17 00:00:00 2001 From: Bernice Date: Fri, 2 Aug 2024 10:56:02 -0700 Subject: [PATCH 08/27] Updated files.tsx to fix failing IOS E2E tests --- .../src/components/privateApis/FilesAPIs.tsx | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx index 959b4a8134..a7fe0ca4fd 100644 --- a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx +++ b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx @@ -1,4 +1,4 @@ -import { FileOpenPreference, files, SdkError } from '@microsoft/teams-js'; +import { app, FileOpenPreference, files, HostClientType, SdkError } from '@microsoft/teams-js'; import React, { ChangeEvent, ReactElement } from 'react'; import { noHostSdkMsg } from '../../App'; @@ -91,21 +91,29 @@ const AddCloudStorageFolder = (): React.ReactElement => } }, submit: async (input, setResult) => { - - const callback = (error: SdkError, isFolderAdded: boolean, folders: files.CloudStorageFolder[]): void => { + const callback = async ( + error: SdkError, + isFolderAdded: boolean, + folders: files.CloudStorageFolder[], + ): Promise => { if (error) { setResult(JSON.stringify(error)); } else { const result = { folders, isFolderAdded }; - // Sort the result object properties before returning - const sortedResult = Object.keys(result) - .sort() - .reduce((acc, key) => { - acc[key] = result[key]; - return acc; - }, {}); - setResult(JSON.stringify(sortedResult)); + const hostClientType = (await app.getContext()).app.host.clientType; + if (hostClientType === HostClientType.android) { + // Sort the result object properties before returning for the android test app + const sortedResult = Object.keys(result) + .sort() + .reduce((acc, key) => { + acc[key] = result[key]; + return acc; + }, {}); + setResult(JSON.stringify(sortedResult)); + } else { + setResult(JSON.stringify(result)); + } } }; From 66fed79bdb283aee6f7cc566b5c3cdece01afb0b Mon Sep 17 00:00:00 2001 From: Bernice Date: Fri, 2 Aug 2024 12:20:57 -0700 Subject: [PATCH 09/27] Updated filesApIs.tsx to fix failing IOS UI tests --- apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx index a7fe0ca4fd..3a94d500a5 100644 --- a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx +++ b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx @@ -99,10 +99,9 @@ const AddCloudStorageFolder = (): React.ReactElement => if (error) { setResult(JSON.stringify(error)); } else { - const result = { folders, isFolderAdded }; - const hostClientType = (await app.getContext()).app.host.clientType; if (hostClientType === HostClientType.android) { + const result = { isFolderAdded, folders }; // Sort the result object properties before returning for the android test app const sortedResult = Object.keys(result) .sort() @@ -112,7 +111,7 @@ const AddCloudStorageFolder = (): React.ReactElement => }, {}); setResult(JSON.stringify(sortedResult)); } else { - setResult(JSON.stringify(result)); + setResult(JSON.stringify({ isFolderAdded, folders })); } } }; From b4e2168200a562333dab08671753b37f694629d4 Mon Sep 17 00:00:00 2001 From: Bernice Date: Fri, 2 Aug 2024 12:56:57 -0700 Subject: [PATCH 10/27] Updated app.json file --- apps/teams-test-app/e2e-test-data/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/app.json b/apps/teams-test-app/e2e-test-data/app.json index 1a43f91073..ddfa0af4a1 100644 --- a/apps/teams-test-app/e2e-test-data/app.json +++ b/apps/teams-test-app/e2e-test-data/app.json @@ -1,6 +1,6 @@ { "name": "App", - "platforms": ["iOS","Web"], + "platforms": ["*"], "testCases": [ { "title": "openLink API Call - Success", From 78347f47f41970a3a80591e3550e10c4fe6099da Mon Sep 17 00:00:00 2001 From: Bernice Date: Fri, 2 Aug 2024 15:38:27 -0700 Subject: [PATCH 11/27] Fixed typo --- apps/teams-test-app/e2e-test-data/app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/app.json b/apps/teams-test-app/e2e-test-data/app.json index ddfa0af4a1..9cce591ef5 100644 --- a/apps/teams-test-app/e2e-test-data/app.json +++ b/apps/teams-test-app/e2e-test-data/app.json @@ -39,7 +39,7 @@ { "title": "openLink composeMeeting API Call - Success", "type": "callResponse", - "boxSelector": "#box_e.jxecuteDeepLink2", + "boxSelector": "#box_executeDeepLink2", "inputValue": "https://teams.microsoft.com/l/meeting/new?subject=testSubject&attendees=testAttendee1,testAttendee2&startTime=testStartTime&endTime=testEndTime&content=testContent", "expectedAlertValue": "composeMeeting called with {\"attendees\":[\"testAttendee1\",\"testAttendee2\"],\"startTime\":\"testStartTime\",\"endTime\":\"testEndTime\",\"subject\":\"testSubject\",\"content\":\"testContent\"}", "expectedTestAppValue": "Completed" From d9a289bd24aa721bcfa5bb9c291b16217108bff3 Mon Sep 17 00:00:00 2001 From: Bernice Date: Sat, 3 Aug 2024 03:13:49 -0700 Subject: [PATCH 12/27] Updated test app for Secondary Browser isSupported Check --- .../src/components/SecondaryBrowserAPIs.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx b/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx index 21240fce0d..db1e0fdc54 100644 --- a/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx +++ b/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx @@ -1,4 +1,4 @@ -import { secondaryBrowser } from '@microsoft/teams-js'; +import { app, HostClientType, secondaryBrowser } from '@microsoft/teams-js'; import React, { ReactElement } from 'react'; import { ApiWithoutInput, ApiWithTextInput } from './utils'; @@ -8,7 +8,16 @@ const CheckSecondaryBrowserCapability = (): React.ReactElement => ApiWithoutInput({ name: 'CheckSecondaryBrowserCapability', title: 'Check SecondaryBrowser Capability', - onClick: async () => `secondaryBrowser module ${secondaryBrowser.isSupported() ? 'is' : 'is not'} supported`, + onClick: async () => { + const hostClientType = (await app.getContext()).app.host.clientType; + let browserModule = 'secondaryBrowser'; + + if (hostClientType === HostClientType.android) { + browserModule = 'SecondaryBrowser'; + } + + return `${browserModule} module ${secondaryBrowser.isSupported() ? 'is' : 'is not'} supported`; + }, }); const Open = (): React.ReactElement => From 711413b906b8ffdf0c78cf3756342eb54e1be6fc Mon Sep 17 00:00:00 2001 From: Bernice Date: Sun, 4 Aug 2024 09:20:33 -0700 Subject: [PATCH 13/27] Reverted checkBrowserSupportCapability to previous version --- apps/teams-test-app/e2e-test-data/meeting.json | 4 ++-- .../e2e-test-data/meetingRoom.json | 16 ++++++++++++++++ .../src/components/SecondaryBrowserAPIs.tsx | 14 ++------------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/meeting.json b/apps/teams-test-app/e2e-test-data/meeting.json index 26d1dc104b..9119947bad 100644 --- a/apps/teams-test-app/e2e-test-data/meeting.json +++ b/apps/teams-test-app/e2e-test-data/meeting.json @@ -1,6 +1,6 @@ { "name": "Meeting", - "platforms": "Web", + "platforms": ["Web","Android"], "testUrlParams": [["frameContext", "sidePanel"]], "testCases": [ { @@ -278,8 +278,8 @@ { "title": "shareAppContentToStage API Call with shareOptions (TJS>=2.19.0, host SDK>=2.8.0) - Success", "type": "callResponse", - "version": ">=2.19.0", "platformsExcluded":["Android"], + "version": ">=2.19.0", "hostSdkVersion": { "web": ">=2.8.0" }, diff --git a/apps/teams-test-app/e2e-test-data/meetingRoom.json b/apps/teams-test-app/e2e-test-data/meetingRoom.json index 1eb0c8a40e..1febdb8eb5 100644 --- a/apps/teams-test-app/e2e-test-data/meetingRoom.json +++ b/apps/teams-test-app/e2e-test-data/meetingRoom.json @@ -45,6 +45,7 @@ { "title": "registerMeetingRoomStatesUpdateHandler API Call - Handler", "type": "registerAndRaiseEvent", + "platformsExcluded": ["Android"], "boxSelector": "#box_registerMeetingRoomStatesUpdateHandler", "eventName": "meetingRoomStatesUpdate", "eventData": { @@ -55,6 +56,21 @@ "leaveMeeting": true }, "expectedTestAppValue": "States of meeting room update ##JSON_EVENT_DATA##" + }, + { + "title": "registerMeetingRoomStatesUpdateHandler API Call - Handler", + "type": "registerAndRaiseEvent", + "platformsExcluded": ["iOS","Web"], + "boxSelector": "#box_registerMeetingRoomStatesUpdateHandler", + "eventName": "meetingRoomStatesUpdate", + "eventData": { + "toggleMute": true, + "toggleCamera": true, + "toggleCaptions": true, + "stageLayout": "Gallery", + "leaveMeeting": true + }, + "expectedTestAppValue": "States of meeting room update ##JSON_EVENT_DATA##" } ] } diff --git a/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx b/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx index db1e0fdc54..c97581bead 100644 --- a/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx +++ b/apps/teams-test-app/src/components/SecondaryBrowserAPIs.tsx @@ -1,4 +1,4 @@ -import { app, HostClientType, secondaryBrowser } from '@microsoft/teams-js'; +import { secondaryBrowser } from '@microsoft/teams-js'; import React, { ReactElement } from 'react'; import { ApiWithoutInput, ApiWithTextInput } from './utils'; @@ -8,16 +8,7 @@ const CheckSecondaryBrowserCapability = (): React.ReactElement => ApiWithoutInput({ name: 'CheckSecondaryBrowserCapability', title: 'Check SecondaryBrowser Capability', - onClick: async () => { - const hostClientType = (await app.getContext()).app.host.clientType; - let browserModule = 'secondaryBrowser'; - - if (hostClientType === HostClientType.android) { - browserModule = 'SecondaryBrowser'; - } - - return `${browserModule} module ${secondaryBrowser.isSupported() ? 'is' : 'is not'} supported`; - }, + onClick: async () => `secondaryBrowser module ${secondaryBrowser.isSupported() ? 'is' : 'is not'} supported`, }); const Open = (): React.ReactElement => @@ -29,7 +20,6 @@ const Open = (): React.ReactElement => if (typeof input !== 'string') { throw new Error('Input should be a string'); } - // validate that input should also be a valid URL new URL(input); }, From ae867c763da8521a0fccc92649749326b0a440f3 Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 02:50:12 -0700 Subject: [PATCH 14/27] Updated pages.json test data file to be used by Android E2E test engine --- apps/teams-test-app/e2e-test-data/pages.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/pages.json b/apps/teams-test-app/e2e-test-data/pages.json index 4042169d78..befa786d5c 100644 --- a/apps/teams-test-app/e2e-test-data/pages.json +++ b/apps/teams-test-app/e2e-test-data/pages.json @@ -12,7 +12,7 @@ { "title": "getConfig API Call - Default Response", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_config_getConfig", "modulesToDisable": ["pageConfigToggle"], "expectedTestAppValue": "{\"contentUrl\":\"https://localhost:4000\",\"entityId\":\"serverUrl\",\"suggestedDisplayName\":\"Server Url\"}" @@ -28,6 +28,7 @@ { "title": "setCurrentFrame API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_setCurrentFrame", "inputValue": { "contentUrl": "https://localhost:4000/app", @@ -62,6 +63,7 @@ { "title": "navigateCrossDomain API Call - Success", "type": "callResponse", + "platformsExcluded": ["Android"], "version": "2.0.0-beta.2", "boxSelector": "#box_navigateCrossDomain", "inputValue": "https://teams-test-tab.azurewebsites.net", @@ -71,7 +73,7 @@ { "title": "shareDeepLink API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "version": "<=2.1.0", "boxSelector": "#box_core\\.shareDeepLink", "inputValue": { @@ -85,7 +87,7 @@ { "title": "shareDeepLink API Call - Success", "type": "callResponse", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "version": ">2.1.0", "boxSelector": "#box_pages\\.shareDeepLink", "inputValue": { @@ -99,7 +101,7 @@ { "title": "registerFullScreenChangeHandler API Call - Handler", "type": "registerAndRaiseEvent", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "boxSelector": "#box_registerFullScreenChangeHandler", "eventName": "fullScreenChange", "eventData": true, @@ -108,7 +110,7 @@ { "title": "registerFocusEnterHandler API Call - Handler", "type": "registerAndRaiseEvent", - "platformsExcluded": ["iOS"], + "platformsExcluded": ["iOS","Android"], "version": "1.x || >2.0.0-beta.2", "boxSelector": "#box_registerFocusEnterHandler", "eventName": "focusEnter", From 00064d775a0bbf406e56171432e6dd105bb89b56 Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 03:29:28 -0700 Subject: [PATCH 15/27] Updated stagelayout to s type string as required by test app --- apps/teams-test-app/e2e-test-data/meetingRoom.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/meetingRoom.json b/apps/teams-test-app/e2e-test-data/meetingRoom.json index 1febdb8eb5..bbe370bd41 100644 --- a/apps/teams-test-app/e2e-test-data/meetingRoom.json +++ b/apps/teams-test-app/e2e-test-data/meetingRoom.json @@ -45,14 +45,14 @@ { "title": "registerMeetingRoomStatesUpdateHandler API Call - Handler", "type": "registerAndRaiseEvent", - "platformsExcluded": ["Android"], + "platformsExcluded": ["iOS","Web"], "boxSelector": "#box_registerMeetingRoomStatesUpdateHandler", "eventName": "meetingRoomStatesUpdate", "eventData": { "toggleMute": true, "toggleCamera": true, "toggleCaptions": true, - "stageLayout": ["Gallery"], + "stageLayout": "Gallery", "leaveMeeting": true }, "expectedTestAppValue": "States of meeting room update ##JSON_EVENT_DATA##" @@ -60,14 +60,14 @@ { "title": "registerMeetingRoomStatesUpdateHandler API Call - Handler", "type": "registerAndRaiseEvent", - "platformsExcluded": ["iOS","Web"], + "platformsExcluded": ["Android"], "boxSelector": "#box_registerMeetingRoomStatesUpdateHandler", "eventName": "meetingRoomStatesUpdate", "eventData": { "toggleMute": true, "toggleCamera": true, "toggleCaptions": true, - "stageLayout": "Gallery", + "stageLayout": ["Gallery"], "leaveMeeting": true }, "expectedTestAppValue": "States of meeting room update ##JSON_EVENT_DATA##" From b4c293f9b4121f950d45d97659302e00cf0f9f95 Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 09:07:04 -0700 Subject: [PATCH 16/27] Updated meetig room JSON --- apps/teams-test-app/e2e-test-data/meeting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/meeting.json b/apps/teams-test-app/e2e-test-data/meeting.json index 9119947bad..e6eefe5baf 100644 --- a/apps/teams-test-app/e2e-test-data/meeting.json +++ b/apps/teams-test-app/e2e-test-data/meeting.json @@ -23,7 +23,6 @@ "title": "getMeetingDetails API Call - Success", "version": "<=2.22.0", "type": "callResponse", - "platformsExcluded": ["Android"], "boxSelector": "#box_getMeetingDetails", "expectedAlertValue": "getMeetingDetails called", "expectedTestAppValue": "{\"details\":{\"id\":\"testDetailsId\",\"scheduledStartTime\":\"testStartTime\",\"scheduledEndTime\":\"testEndTime\",\"joinUrl\":\"testJoinUrl\",\"title\":\"testTitle\",\"type\":\"Unknown\"},\"conversation\":{\"id\":\"testConversationId\"},\"organizer\":{\"id\":\"testOrganizerId\",\"tenantId\":\"testTenantId\"}}" @@ -31,6 +30,7 @@ { "title": "getMeetingDetails API Call - Success", "version": ">2.22.0", + "platformsExcluded": ["Android"], "type": "callResponse", "boxSelector": "#box_getMeetingDetails", "expectedAlertValue": "getMeetingDetails called with shouldGetVerboseDetails: undefined", From d9d7a835fea28fdaef3bc55eea9cbcb7d3d770bf Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 10:20:09 -0700 Subject: [PATCH 17/27] Updated meeting.json file --- apps/teams-test-app/e2e-test-data/meeting.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/meeting.json b/apps/teams-test-app/e2e-test-data/meeting.json index e6eefe5baf..7d36fab057 100644 --- a/apps/teams-test-app/e2e-test-data/meeting.json +++ b/apps/teams-test-app/e2e-test-data/meeting.json @@ -22,6 +22,7 @@ { "title": "getMeetingDetails API Call - Success", "version": "<=2.22.0", + "platformsExcluded": ["Android"], "type": "callResponse", "boxSelector": "#box_getMeetingDetails", "expectedAlertValue": "getMeetingDetails called", @@ -30,7 +31,6 @@ { "title": "getMeetingDetails API Call - Success", "version": ">2.22.0", - "platformsExcluded": ["Android"], "type": "callResponse", "boxSelector": "#box_getMeetingDetails", "expectedAlertValue": "getMeetingDetails called with shouldGetVerboseDetails: undefined", @@ -228,7 +228,6 @@ { "title": "shareAppContentToStage API Call (TJS >=2.19.0, host SDK>=2.8.0) - Success", "type": "callResponse", - "platformsExcluded": ["Android"], "version": ">=2.19.0", "hostSdkVersion": { "web": ">=2.8.0" From c214e7daeecd84264d4a5e3dc7e76cd9ccbd9c27 Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 10:57:17 -0700 Subject: [PATCH 18/27] Updated meeting.json file --- .../e2e-test-data/meetingRoom.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/meetingRoom.json b/apps/teams-test-app/e2e-test-data/meetingRoom.json index bbe370bd41..c1414cea32 100644 --- a/apps/teams-test-app/e2e-test-data/meetingRoom.json +++ b/apps/teams-test-app/e2e-test-data/meetingRoom.json @@ -45,7 +45,6 @@ { "title": "registerMeetingRoomStatesUpdateHandler API Call - Handler", "type": "registerAndRaiseEvent", - "platformsExcluded": ["iOS","Web"], "boxSelector": "#box_registerMeetingRoomStatesUpdateHandler", "eventName": "meetingRoomStatesUpdate", "eventData": { @@ -56,21 +55,6 @@ "leaveMeeting": true }, "expectedTestAppValue": "States of meeting room update ##JSON_EVENT_DATA##" - }, - { - "title": "registerMeetingRoomStatesUpdateHandler API Call - Handler", - "type": "registerAndRaiseEvent", - "platformsExcluded": ["Android"], - "boxSelector": "#box_registerMeetingRoomStatesUpdateHandler", - "eventName": "meetingRoomStatesUpdate", - "eventData": { - "toggleMute": true, - "toggleCamera": true, - "toggleCaptions": true, - "stageLayout": ["Gallery"], - "leaveMeeting": true - }, - "expectedTestAppValue": "States of meeting room update ##JSON_EVENT_DATA##" } ] } From 5c9aa31de1a8c00592ccb701b82a128621a89031 Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 11:01:50 -0700 Subject: [PATCH 19/27] Updated meeting.json --- apps/teams-test-app/e2e-test-data/meeting.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/meeting.json b/apps/teams-test-app/e2e-test-data/meeting.json index 7d36fab057..6517e09d4e 100644 --- a/apps/teams-test-app/e2e-test-data/meeting.json +++ b/apps/teams-test-app/e2e-test-data/meeting.json @@ -393,7 +393,7 @@ "expectedTestAppValue": "updateMicState called with micState: isMicMuted:true" }, { - "title": "joinMeeting API Call - Success", + "title": "joinMeeting API Call - Error", "type": "callResponse", "platformsExcluded": ["Android"], "version": ">2.20.0", @@ -402,14 +402,12 @@ }, "boxSelector": "#box_joinMeeting", "inputValue": { - "joinWebUrl": "https://www.example.com/", "source": "Other" }, - "expectedAlertValue": "joinMeeting called with joinWebUrl: https://www.example.com/", - "expectedTestAppValue": "joinMeeting called with joinWebUrl: https://www.example.com/" + "expectedTestAppValue": "Error: Error: joinWebUrl not passed" }, { - "title": "joinMeeting API Call - Error", + "title": "joinMeeting API Call - Success", "type": "callResponse", "platformsExcluded": ["Android"], "version": ">2.20.0", @@ -418,9 +416,12 @@ }, "boxSelector": "#box_joinMeeting", "inputValue": { + "joinWebUrl": "https://www.example.com/", "source": "Other" }, - "expectedTestAppValue": "Error: Error: joinWebUrl not passed" + "expectedAlertValue": "joinMeeting called with joinWebUrl: https://www.example.com/", + "expectedTestAppValue": "joinMeeting called with joinWebUrl: https://www.example.com/" } + ] } From 844ff13a733e202394675f2bf93c52ef528850e6 Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 11:57:44 -0700 Subject: [PATCH 20/27] Updated Meeting.json to tackle build fail --- apps/teams-test-app/e2e-test-data/meeting.json | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/meeting.json b/apps/teams-test-app/e2e-test-data/meeting.json index 6517e09d4e..7d36fab057 100644 --- a/apps/teams-test-app/e2e-test-data/meeting.json +++ b/apps/teams-test-app/e2e-test-data/meeting.json @@ -393,7 +393,7 @@ "expectedTestAppValue": "updateMicState called with micState: isMicMuted:true" }, { - "title": "joinMeeting API Call - Error", + "title": "joinMeeting API Call - Success", "type": "callResponse", "platformsExcluded": ["Android"], "version": ">2.20.0", @@ -402,12 +402,14 @@ }, "boxSelector": "#box_joinMeeting", "inputValue": { + "joinWebUrl": "https://www.example.com/", "source": "Other" }, - "expectedTestAppValue": "Error: Error: joinWebUrl not passed" + "expectedAlertValue": "joinMeeting called with joinWebUrl: https://www.example.com/", + "expectedTestAppValue": "joinMeeting called with joinWebUrl: https://www.example.com/" }, { - "title": "joinMeeting API Call - Success", + "title": "joinMeeting API Call - Error", "type": "callResponse", "platformsExcluded": ["Android"], "version": ">2.20.0", @@ -416,12 +418,9 @@ }, "boxSelector": "#box_joinMeeting", "inputValue": { - "joinWebUrl": "https://www.example.com/", "source": "Other" }, - "expectedAlertValue": "joinMeeting called with joinWebUrl: https://www.example.com/", - "expectedTestAppValue": "joinMeeting called with joinWebUrl: https://www.example.com/" + "expectedTestAppValue": "Error: Error: joinWebUrl not passed" } - ] } From d98d07840a7b86986c6206d47646cf6e4eb4e064 Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 15:55:30 -0700 Subject: [PATCH 21/27] Updated meeting.json --- apps/teams-test-app/e2e-test-data/meeting.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/meeting.json b/apps/teams-test-app/e2e-test-data/meeting.json index 7d36fab057..ab27d13b58 100644 --- a/apps/teams-test-app/e2e-test-data/meeting.json +++ b/apps/teams-test-app/e2e-test-data/meeting.json @@ -22,7 +22,6 @@ { "title": "getMeetingDetails API Call - Success", "version": "<=2.22.0", - "platformsExcluded": ["Android"], "type": "callResponse", "boxSelector": "#box_getMeetingDetails", "expectedAlertValue": "getMeetingDetails called", @@ -32,6 +31,7 @@ "title": "getMeetingDetails API Call - Success", "version": ">2.22.0", "type": "callResponse", + "platformsExcluded": ["Android"], "boxSelector": "#box_getMeetingDetails", "expectedAlertValue": "getMeetingDetails called with shouldGetVerboseDetails: undefined", "expectedTestAppValue": "{\"details\":{\"id\":\"testDetailsId\",\"scheduledStartTime\":\"testStartTime\",\"scheduledEndTime\":\"testEndTime\",\"joinUrl\":\"testJoinUrl\",\"title\":\"testTitle\",\"type\":\"Unknown\"},\"conversation\":{\"id\":\"testConversationId\"},\"organizer\":{\"id\":\"testOrganizerId\",\"tenantId\":\"testTenantId\"}}" @@ -228,6 +228,7 @@ { "title": "shareAppContentToStage API Call (TJS >=2.19.0, host SDK>=2.8.0) - Success", "type": "callResponse", + "platformsExcluded":["Android"], "version": ">=2.19.0", "hostSdkVersion": { "web": ">=2.8.0" From 8376b4c462afc222d497a084c2490a63f4fe9b6f Mon Sep 17 00:00:00 2001 From: Bernice Date: Mon, 5 Aug 2024 16:55:56 -0700 Subject: [PATCH 22/27] Included comment changes in FilesAPIs.tsx file --- apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx index 3a94d500a5..e88f1fa740 100644 --- a/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx +++ b/apps/teams-test-app/src/components/privateApis/FilesAPIs.tsx @@ -99,6 +99,7 @@ const AddCloudStorageFolder = (): React.ReactElement => if (error) { setResult(JSON.stringify(error)); } else { + //This ensures the output is sorted correctly in the Android Test app, as specified by the JSON test data file. const hostClientType = (await app.getContext()).app.host.clientType; if (hostClientType === HostClientType.android) { const result = { isFolderAdded, folders }; From 7da78f25b683bc30151e93853a14d7f5c38fdb08 Mon Sep 17 00:00:00 2001 From: Bernice Date: Tue, 6 Aug 2024 12:48:35 -0700 Subject: [PATCH 23/27] Updated test name to specify just Android platform --- apps/teams-test-app/e2e-test-data/geoLocation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index 632249a497..1e8d0ae7e1 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -29,7 +29,7 @@ "expectedTestAppValue": "true" }, { - "title": "getCurrentLocation API Call - Success", + "title": "getCurrentLocation API Call - AndroidPlatform - Success", "type": "callResponse", "platformsExcluded": ["Web"], "boxSelector": "#box_getCurrentLocation", From 6dd86f883ea2beadc570ffd35387631b990ba4e1 Mon Sep 17 00:00:00 2001 From: Bernice Date: Tue, 6 Aug 2024 13:03:09 -0700 Subject: [PATCH 24/27] Specified JSON getCurrentLocation to be For just Android Platform --- apps/teams-test-app/e2e-test-data/geoLocation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index 1e8d0ae7e1..23c815269a 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -29,7 +29,7 @@ "expectedTestAppValue": "true" }, { - "title": "getCurrentLocation API Call - AndroidPlatform - Success", + "title": "Android getCurrentLocation API Call - Success", "type": "callResponse", "platformsExcluded": ["Web"], "boxSelector": "#box_getCurrentLocation", From f61c9e7151fdf5ef27a9efbbb969e05ec2336804 Mon Sep 17 00:00:00 2001 From: Bernice Date: Tue, 6 Aug 2024 13:50:03 -0700 Subject: [PATCH 25/27] fixing build errors --- apps/teams-test-app/e2e-test-data/geoLocation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index 23c815269a..632249a497 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -29,7 +29,7 @@ "expectedTestAppValue": "true" }, { - "title": "Android getCurrentLocation API Call - Success", + "title": "getCurrentLocation API Call - Success", "type": "callResponse", "platformsExcluded": ["Web"], "boxSelector": "#box_getCurrentLocation", From 4f1e48c7f4485257760f29eb55d9b473c993878b Mon Sep 17 00:00:00 2001 From: Bernice Date: Tue, 6 Aug 2024 13:51:35 -0700 Subject: [PATCH 26/27] Making changes to geolocation --- apps/teams-test-app/e2e-test-data/geoLocation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index 632249a497..23c815269a 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -29,7 +29,7 @@ "expectedTestAppValue": "true" }, { - "title": "getCurrentLocation API Call - Success", + "title": "Android getCurrentLocation API Call - Success", "type": "callResponse", "platformsExcluded": ["Web"], "boxSelector": "#box_getCurrentLocation", From d4b578d442a75cee7780115263c7e0c0c7cf1e1a Mon Sep 17 00:00:00 2001 From: BEChiaha Date: Thu, 8 Aug 2024 11:47:08 -0700 Subject: [PATCH 27/27] Updated getCurrentLocation title to be Android specific test --- apps/teams-test-app/e2e-test-data/geoLocation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/teams-test-app/e2e-test-data/geoLocation.json b/apps/teams-test-app/e2e-test-data/geoLocation.json index 23c815269a..ba05e08ed9 100644 --- a/apps/teams-test-app/e2e-test-data/geoLocation.json +++ b/apps/teams-test-app/e2e-test-data/geoLocation.json @@ -29,7 +29,7 @@ "expectedTestAppValue": "true" }, { - "title": "Android getCurrentLocation API Call - Success", + "title": "getCurrentLocation API Call - AndroidSpecific - Success", "type": "callResponse", "platformsExcluded": ["Web"], "boxSelector": "#box_getCurrentLocation", @@ -43,7 +43,7 @@ { "title": "getCurrentLocation API Call - Success", "type": "callResponse", - "platformsExcluded": ["Web"], + "platformsExcluded": ["Web","Android"], "boxSelector": "#box_getCurrentLocation", "requestPermissionBeforeThisCall": { "boxSelector": "#box_requestGeoLocationPermission",