Fix iPhone horizontal test runs

Author: dfeinzimer

Test Runner/Test Runner/TestViews/AttachmentCameraControllerTestView.swift

@@ -20,6 +20,8 @@ import SwiftUI
 struct AttachmentCameraControllerTestView: View {
     @State private var captureMode: UIImagePickerController.CameraCaptureMode?
 
+    @State private var orientation = UIDeviceOrientation.unknown
+    
     var body: some View {
         Color.clear
             .fullScreenCover(isPresented: .constant(true)) {
@@ -28,13 +30,34 @@ struct AttachmentCameraControllerTestView: View {
                         self.captureMode = captureMode
                     }
                     .overlay {
-                        Text(captureMode?.name ?? "None")
-                            .accessibilityIdentifier("Camera Capture Mode")
+                        VStack {
+                            Text(captureMode?.name ?? "None")
+                                .accessibilityIdentifier("Camera Capture Mode")
+                            Text(orientation.name)
+                                .accessibilityIdentifier("Device Orientation")
+                                .onReceive(NotificationCenter.default.publisher(for: UIDevice.orientationDidChangeNotification)) { _ in
+                                    orientation = UIDevice.current.orientation
+                                }
+                                .task {
+                                    orientation = UIDevice.current.orientation
+                                }
+                        }
                     }
             }
     }
 }
 
+extension UIDeviceOrientation {
+    var name: String {
+        switch self {
+        case .portrait: "Portrait"
+        case .landscapeLeft: "Landscape Left"
+        case .landscapeRight: "Landscape Right"
+        default: "Other"
+        }
+    }
+}
+
 extension UIImagePickerController.CameraCaptureMode {
     var name: String {
         switch self {

Test Runner/UI Tests/AttachmentCameraControllerTests.swift

@@ -29,8 +29,8 @@ final class AttachmentCameraControllerTests: XCTestCase {
         let app = XCUIApplication()
         let cameraModeController = app.otherElements["CameraMode"]
         let cameraModeLabel = app.staticTexts["Camera Capture Mode"]
-        let deviceOrientation = XCUIDevice.shared.orientation
-        let deviceType = UIDevice.current.userInterfaceIdiom
+        let device = UIDevice.current.userInterfaceIdiom
+        let orientation = app.staticTexts["Device Orientation"]
 
         app.launch()
 
@@ -55,21 +55,21 @@ final class AttachmentCameraControllerTests: XCTestCase {
             cameraModeController.waitForExistence(timeout: 5)
         )
 
-        if deviceType == .pad {
+        if device == .pad || (device == .phone && orientation.label == "Landscape Right") {
             cameraModeController.swipeDown()
-        } else if deviceOrientation.isLandscape && deviceType == .phone {
+        } else if orientation.label == "Landscape Left" {
             cameraModeController.swipeUp()
-        } else {
+        } else /* iPhone - portrait */ {
             cameraModeController.swipeRight()
         }
 
         XCTAssertEqual(cameraModeLabel.label, "Video")
 
-        if deviceType == .pad {
+        if device == .pad || (device == .phone && orientation.label == "Landscape Right") {
             cameraModeController.swipeUp()
-        } else if deviceOrientation.isLandscape && deviceType == .phone {
+        } else if orientation.label == "Landscape Left" {
             cameraModeController.swipeDown()
-        } else {
+        } else /* iPhone - portrait */ {
             cameraModeController.swipeLeft()
         }