Adding microsoft#1480

sophialee0416 · Jan 13, 2023 · 46d4470 · 46d4470
2 parents 6107408 + 2482a73
commit 46d4470
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,6 +42,7 @@ jobs:
           'ios_device_build FluentUI-iOS Release build',
           'ios_simulator_build Demo.Development Debug build',
           'ios_simulator_build Demo.Development Release build',
+          'ios_simulator_build Demo.Development Debug build test -destination "platform=iOS Simulator,name=iPhone 14 Pro"',
           'ios_device_build Demo.Development Debug build',
           'ios_device_build Demo.Development Release build',
         ]

diff --git a/ios/FluentUI.Demo/FluentUI.Demo.xcodeproj/xcshareddata/xcschemes/Demo.Development.xcscheme b/ios/FluentUI.Demo/FluentUI.Demo.xcodeproj/xcshareddata/xcschemes/Demo.Development.xcscheme
@@ -75,8 +75,7 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "3A83F7BE295110FF00EF6629"

diff --git a/ios/FluentUI.Demo/FluentUIDemoTests/BaseTest.swift b/ios/FluentUI.Demo/FluentUIDemoTests/BaseTest.swift
@@ -7,7 +7,6 @@ import XCTest
 
 class BaseTest: XCTestCase {
     let app = XCUIApplication()
-    let fluentUIDev: String = "FluentUI DEV"
     // must be overridden
     var controlName: String { "Base" }
 
@@ -16,18 +15,14 @@ class BaseTest: XCTestCase {
         continueAfterFailure = false
         app.launch()
 
-        let onHomePage: Bool = app.staticTexts[fluentUIDev].exists
-        let controlPage: XCUIElement = app.staticTexts[controlName]
-        let onDifferentControlPage: Bool = !onHomePage && !controlPage.exists
-        let backButton: XCUIElement = app.buttons[fluentUIDev].exists ? app.buttons[fluentUIDev] : app.buttons["Dismiss"]
-
-        if onHomePage {
-            XCTAssertTrue(!onDifferentControlPage)
-            controlPage.tap()
-        } else if onDifferentControlPage {
-            XCTAssertTrue(!onHomePage && !controlPage.exists)
-            backButton.tap()
-            controlPage.tap()
+        let onHomePage: Bool = app.staticTexts["FluentUI DEV"].exists
+        if !onHomePage {
+            if !app.navigationBars.element.exists {
+                app.buttons["Dismiss"].tap()
+            } else {
+                app.buttons.firstMatch.tap()
+            }
         }
+        app.staticTexts[controlName].tap()
     }
 }