From 81a91e10f9181aa5f0b68e05120b43b5b0fa8c83 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:15:18 +0500 Subject: [PATCH 01/13] Running only one test temporarily on Github --- .../LocationServices.xctestplan | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan index 5c029322..ab8156e3 100644 --- a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan +++ b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan @@ -19,20 +19,29 @@ "testTargets" : [ { "skippedTests" : [ + "AWSConnectUITests", "AWSConnectUITests\/testConnectAWSAccount()", "AWSConnectUITests\/testConnectAWSAccountFromGeofence()", "AWSConnectUITests\/testConnectAWSAccountFromTracking()", "AWSConnectUITests\/testSignInAWSAccount()", + "GeofenceUITests", "GeofenceUITests\/testAddGeofence()", "GeofenceUITests\/testDeleteGeofence()", "GeofenceUITests\/testEditGeofence()", + "LocationServicesUITests", + "MapUITests", "MapUITests\/testMapAppearance()", "MapUITests\/testMapMaxZoomIn()", "MapUITests\/testMapMaxZoomOut()", + "NavigationUITests", + "SearchUITests", + "SettingsUITests", "TrackingUITests\/testStartTracking()", "TrackingUITests\/testStartTrackingHistoryStarted()", "TrackingUITests\/testStopTracking()", - "TrackingUITests\/testTrackingNotifyEnteredGeofence()" + "TrackingUITests\/testTrackingDeleteHistoryLog()", + "TrackingUITests\/testTrackingNotifyEnteredGeofence()", + "TrackingUITests\/testTrackingPointsOnMap()" ], "target" : { "containerPath" : "container:LocationServices.xcodeproj", From 46116d5b3f8d6248aa17e5691d30cbb68c531a74 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:19:47 +0500 Subject: [PATCH 02/13] Update test-ios-e2e.yml --- .github/workflows/test-ios-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ios-e2e.yml b/.github/workflows/test-ios-e2e.yml index 2469b8f1..9289790f 100644 --- a/.github/workflows/test-ios-e2e.yml +++ b/.github/workflows/test-ios-e2e.yml @@ -5,7 +5,7 @@ on: branches: - main pull_request: - branches: [main] + branches: [**main] jobs: test-iOS: name: Test iOS App From 43657842f0d896b8b86b6eccb90ca483284d57f0 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:05:16 +0500 Subject: [PATCH 03/13] Update test-ios-e2e.yml --- .github/workflows/test-ios-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-ios-e2e.yml b/.github/workflows/test-ios-e2e.yml index 9289790f..e59f6067 100644 --- a/.github/workflows/test-ios-e2e.yml +++ b/.github/workflows/test-ios-e2e.yml @@ -5,7 +5,7 @@ on: branches: - main pull_request: - branches: [**main] + branches: [**_main, main] jobs: test-iOS: name: Test iOS App From 791bf38967a26fdecf9a5906ce0ff1de75f6ed89 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:06:08 +0500 Subject: [PATCH 04/13] Update test-ios-e2e.yml --- .github/workflows/test-ios-e2e.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-ios-e2e.yml b/.github/workflows/test-ios-e2e.yml index e59f6067..4a071098 100644 --- a/.github/workflows/test-ios-e2e.yml +++ b/.github/workflows/test-ios-e2e.yml @@ -4,8 +4,9 @@ on: push: branches: - main + - *_main pull_request: - branches: [**_main, main] + branches: [*_main, main] jobs: test-iOS: name: Test iOS App From cefd7c0a21a8835d254c8dda769353d12b42d41a Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:07:14 +0500 Subject: [PATCH 05/13] Update test-ios-e2e.yml --- .github/workflows/test-ios-e2e.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-ios-e2e.yml b/.github/workflows/test-ios-e2e.yml index 4a071098..62150b0b 100644 --- a/.github/workflows/test-ios-e2e.yml +++ b/.github/workflows/test-ios-e2e.yml @@ -4,9 +4,8 @@ on: push: branches: - main - - *_main + - **_main pull_request: - branches: [*_main, main] jobs: test-iOS: name: Test iOS App From ffc70c27cfb46ee9c40892f8ff7f90d88a64c015 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:09:04 +0500 Subject: [PATCH 06/13] Update test-ios-e2e.yml --- .github/workflows/test-ios-e2e.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-ios-e2e.yml b/.github/workflows/test-ios-e2e.yml index 62150b0b..eb68eea1 100644 --- a/.github/workflows/test-ios-e2e.yml +++ b/.github/workflows/test-ios-e2e.yml @@ -4,8 +4,9 @@ on: push: branches: - main - - **_main + - "**_main" pull_request: + branches: ["**_main",main] jobs: test-iOS: name: Test iOS App From a16f5c06449628188adde801dd7c9c72bd819e19 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:11:30 +0500 Subject: [PATCH 07/13] Update test-ios-e2e.yml --- .github/workflows/test-ios-e2e.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-ios-e2e.yml b/.github/workflows/test-ios-e2e.yml index eb68eea1..2469b8f1 100644 --- a/.github/workflows/test-ios-e2e.yml +++ b/.github/workflows/test-ios-e2e.yml @@ -4,9 +4,8 @@ on: push: branches: - main - - "**_main" pull_request: - branches: ["**_main",main] + branches: [main] jobs: test-iOS: name: Test iOS App From af55a5a472cc3d9e829d6d26ef27cca63c1f1dc7 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:31:13 +0500 Subject: [PATCH 08/13] Revert "Running only one test temporarily on Github" This reverts commit 81a91e10f9181aa5f0b68e05120b43b5b0fa8c83. --- .../LocationServices.xctestplan | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan index ab8156e3..5c029322 100644 --- a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan +++ b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan @@ -19,29 +19,20 @@ "testTargets" : [ { "skippedTests" : [ - "AWSConnectUITests", "AWSConnectUITests\/testConnectAWSAccount()", "AWSConnectUITests\/testConnectAWSAccountFromGeofence()", "AWSConnectUITests\/testConnectAWSAccountFromTracking()", "AWSConnectUITests\/testSignInAWSAccount()", - "GeofenceUITests", "GeofenceUITests\/testAddGeofence()", "GeofenceUITests\/testDeleteGeofence()", "GeofenceUITests\/testEditGeofence()", - "LocationServicesUITests", - "MapUITests", "MapUITests\/testMapAppearance()", "MapUITests\/testMapMaxZoomIn()", "MapUITests\/testMapMaxZoomOut()", - "NavigationUITests", - "SearchUITests", - "SettingsUITests", "TrackingUITests\/testStartTracking()", "TrackingUITests\/testStartTrackingHistoryStarted()", "TrackingUITests\/testStopTracking()", - "TrackingUITests\/testTrackingDeleteHistoryLog()", - "TrackingUITests\/testTrackingNotifyEnteredGeofence()", - "TrackingUITests\/testTrackingPointsOnMap()" + "TrackingUITests\/testTrackingNotifyEnteredGeofence()" ], "target" : { "containerPath" : "container:LocationServices.xcodeproj", From 236e8e0138e6dc14d6f91ffef950cd332b435441 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:33:13 +0500 Subject: [PATCH 09/13] Added extra points in Geofence exit --- .../LocationServicesUITests/TrackingUITests.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/LocationServices/LocationServicesUITests/TrackingUITests.swift b/LocationServices/LocationServicesUITests/TrackingUITests.swift index 63a05e70..117cbb0c 100644 --- a/LocationServices/LocationServicesUITests/TrackingUITests.swift +++ b/LocationServices/LocationServicesUITests/TrackingUITests.swift @@ -249,7 +249,10 @@ final class TrackingUITests: LocationServicesUITests { .waitForGeofenceEnteredAlert(geofenceName: geofenceName) XCUIDevice.shared.location = .init(location: Constants.trackingPoints[0]) - + Thread.sleep(forTimeInterval: 2) + XCUIDevice.shared.location = .init(location: Constants.trackingPoints[1]) + Thread.sleep(forTimeInterval: 2) + let _ = trackingUIScreen .waitForGeofenceExitedAlert(geofenceName: geofenceName) } From 135c7945aa53b16a4b9251bbb00597459f1f7eaa Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:36:33 +0500 Subject: [PATCH 10/13] Update LocationServices.xctestplan --- .../LocationServices.xctestplan | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan index 5c029322..ab8156e3 100644 --- a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan +++ b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan @@ -19,20 +19,29 @@ "testTargets" : [ { "skippedTests" : [ + "AWSConnectUITests", "AWSConnectUITests\/testConnectAWSAccount()", "AWSConnectUITests\/testConnectAWSAccountFromGeofence()", "AWSConnectUITests\/testConnectAWSAccountFromTracking()", "AWSConnectUITests\/testSignInAWSAccount()", + "GeofenceUITests", "GeofenceUITests\/testAddGeofence()", "GeofenceUITests\/testDeleteGeofence()", "GeofenceUITests\/testEditGeofence()", + "LocationServicesUITests", + "MapUITests", "MapUITests\/testMapAppearance()", "MapUITests\/testMapMaxZoomIn()", "MapUITests\/testMapMaxZoomOut()", + "NavigationUITests", + "SearchUITests", + "SettingsUITests", "TrackingUITests\/testStartTracking()", "TrackingUITests\/testStartTrackingHistoryStarted()", "TrackingUITests\/testStopTracking()", - "TrackingUITests\/testTrackingNotifyEnteredGeofence()" + "TrackingUITests\/testTrackingDeleteHistoryLog()", + "TrackingUITests\/testTrackingNotifyEnteredGeofence()", + "TrackingUITests\/testTrackingPointsOnMap()" ], "target" : { "containerPath" : "container:LocationServices.xcodeproj", From 7efbefdcab6259ec55bb69486e4fe336960802c3 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:54:27 +0500 Subject: [PATCH 11/13] Revert "Update LocationServices.xctestplan" This reverts commit 135c7945aa53b16a4b9251bbb00597459f1f7eaa. --- .../LocationServices.xctestplan | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan index ab8156e3..5c029322 100644 --- a/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan +++ b/LocationServices/LocationServices.xcodeproj/LocationServices.xctestplan @@ -19,29 +19,20 @@ "testTargets" : [ { "skippedTests" : [ - "AWSConnectUITests", "AWSConnectUITests\/testConnectAWSAccount()", "AWSConnectUITests\/testConnectAWSAccountFromGeofence()", "AWSConnectUITests\/testConnectAWSAccountFromTracking()", "AWSConnectUITests\/testSignInAWSAccount()", - "GeofenceUITests", "GeofenceUITests\/testAddGeofence()", "GeofenceUITests\/testDeleteGeofence()", "GeofenceUITests\/testEditGeofence()", - "LocationServicesUITests", - "MapUITests", "MapUITests\/testMapAppearance()", "MapUITests\/testMapMaxZoomIn()", "MapUITests\/testMapMaxZoomOut()", - "NavigationUITests", - "SearchUITests", - "SettingsUITests", "TrackingUITests\/testStartTracking()", "TrackingUITests\/testStartTrackingHistoryStarted()", "TrackingUITests\/testStopTracking()", - "TrackingUITests\/testTrackingDeleteHistoryLog()", - "TrackingUITests\/testTrackingNotifyEnteredGeofence()", - "TrackingUITests\/testTrackingPointsOnMap()" + "TrackingUITests\/testTrackingNotifyEnteredGeofence()" ], "target" : { "containerPath" : "container:LocationServices.xcodeproj", From b4d18c1d2b001dd7c1ee375eaea332ed41c48820 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Fri, 13 Oct 2023 17:11:17 +0500 Subject: [PATCH 12/13] Fixed Tracking history --- .../Coordinators/ChildCoordinators/TrackingCoordinator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LocationServices/LocationServices/Coordinators/ChildCoordinators/TrackingCoordinator.swift b/LocationServices/LocationServices/Coordinators/ChildCoordinators/TrackingCoordinator.swift index bda5dc63..5c999c08 100644 --- a/LocationServices/LocationServices/Coordinators/ChildCoordinators/TrackingCoordinator.swift +++ b/LocationServices/LocationServices/Coordinators/ChildCoordinators/TrackingCoordinator.swift @@ -59,7 +59,7 @@ extension TrackingCoordinator: TrackingNavigationDelegate { let controller = TrackingHistoryBuilder.create(isTrackingActive: isTrackingActive) currentBottomSheet?.dismissBottomSheet() controller.presentBottomSheet(parentController: trackingController!) - controller.enableBottomSheetGrab(smallHeight: 0.12) + controller.enableBottomSheetGrab(smallHeight: 0.14) currentBottomSheet = controller // Starting tracking by default when tapping on Enable tracking button From 464eeea741de95b6de164498aec01c35db93df29 Mon Sep 17 00:00:00 2001 From: Zeeshan Sheikh <64203935+zeeshanmakeen@users.noreply.github.com> Date: Mon, 16 Oct 2023 17:59:41 +0500 Subject: [PATCH 13/13] Update report.xml --- LocationServices/fastlane/report.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/LocationServices/fastlane/report.xml b/LocationServices/fastlane/report.xml index 1dc93bfd..dbb0824a 100644 --- a/LocationServices/fastlane/report.xml +++ b/LocationServices/fastlane/report.xml @@ -5,17 +5,19 @@ - + - + - + + +