test: fix tests with typos in buttons and initial states

Signed-off-by: Pierre-Yves Lapersonne <[email protected]>

Author: pylapp

DesignToolbox/DesignToolbox/Pages/Components/Checkbox/CheckboxPicker/CheckboxPickerPage.swift

@@ -38,7 +38,7 @@ struct CheckboxPickerPage: View {
 
 private struct CheckboxPickerDemo: View {
 
-    @State private var selections: [String] = ["Choice_1"] // cf configurationModel.populate()
+    @State private var selections: [String] = []
     @ObservedObject var configurationModel: CheckboxPickerConfigurationModel
     @Environment(\.theme) private var theme
 

DesignToolbox/DesignToolbox/Resources/Localizable.xcstrings

@@ -897,19 +897,19 @@
       "localizations" : {
         "ar" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Checkbox Item"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Checkbox item"
+            "value" : "Checkbox Item"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Checkbox Item"
           }
         }
@@ -2347,23 +2347,24 @@
       "localizations" : {
         "ar" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Switch Item"
           }
         },
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Switch item"
+            "value" : "Switch Item"
           }
         },
         "fr" : {
           "stringUnit" : {
-            "state" : "translated",
+            "state" : "needs_review",
             "value" : "Switch Item"
           }
         }
-      }
+      },
+      "shouldTranslate" : false
     },
     "app_tokens_border_description_text" : {
       "comment" : "Tokens - Border",

DesignToolbox/DesignToolboxUITests/Components/Checkboxes/CheckboxItemUITests.swift

@@ -26,6 +26,7 @@ final class CheckboxItemUITests: AppTestCase {
         let app = launchApp()
         goToComponentsSheet(app)
         tapButton(withWording: "app_components_checkbox_label", app)
+        waitForButtonToAppear(withWording: "Checkbox Item", app)
         tapButton(withWording: "Checkbox Item", app)
 
         let checkbox = otherElements(withA11yIdentifier: A11YIdentifiers.componentCheckboxItem, app).firstMatch

DesignToolbox/DesignToolboxUITests/Components/Checkboxes/CheckboxPickerUITests.swift

@@ -19,7 +19,8 @@ import XCTest
 /// Tests the accessibility identifiers, labels or values of the items depending to their states and user actions.
 final class CheckboxPickerUITests: AppTestCase {
 
-    /// Select several items and checks if the counter in the root item is updated with the suitable value
+    /// Select several items and checks if the counter in the root item is updated with the suitable values.
+    /// beware, we test the accessiiblity value here as until now label is not dynamically updated with count.
     @MainActor func testCheckboxPickerRootItemCount() throws {
 
         // GIVEN
@@ -29,27 +30,23 @@ final class CheckboxPickerUITests: AppTestCase {
         tapButton(withWording: "app_components_checkbox_label", app)
         tapButton(withWording: "app_components_checkboxPicker_label", app)
 
-        // By default, one element is selected in the picker, wording cannot be used as is
-        var expectedPickerRootItemString = wording(for: "app_components_checkboxPicker_root") + " (1)"
-        assertStaticTextExists(expectedPickerRootItemString, app)
+        // By default, no element is selected in the picker, wording cannot be used as is
+        check(value: pickerRootItemA11yValue(with: 0), ofElementWithIdentifier: pickerRootItemA11yIdentifier(with: 0), app)
 
         // WHEN, THEN
 
-        // Select all
         tapImage(withName: "dog.fill", app)
         tapImage(withName: "waterbottle.fill", app)
-        expectedPickerRootItemString = wording(for: "app_components_checkboxPicker_root") + " (3)"
-        assertStaticTextExists(expectedPickerRootItemString, app)
+        check(value: pickerRootItemA11yValue(with: 2), ofElementWithIdentifier: pickerRootItemA11yIdentifier(with: 2), app)
 
-        // Unselect some
         tapImage(withName: "dog.fill", app)
-        expectedPickerRootItemString = wording(for: "app_components_checkboxPicker_root") + " (2)"
-        assertStaticTextExists(expectedPickerRootItemString, app)
+        check(value: pickerRootItemA11yValue(with: 1), ofElementWithIdentifier: pickerRootItemA11yIdentifier(with: 1), app)
 
-        // Unselect all
         tapImage(withName: "flame", app)
-        tapImage(withName: "waterbottle.fill", app)
-        expectedPickerRootItemString = wording(for: "app_components_checkboxPicker_root")
+        check(value: pickerRootItemA11yValue(with: 2), ofElementWithIdentifier: pickerRootItemA11yIdentifier(with: 2), app)
+
+        tapImage(withName: "dog.fill", app)
+        check(value: pickerRootItemA11yValue(with: 3), ofElementWithIdentifier: pickerRootItemA11yIdentifier(with: 3), app)
     }
 
     /// Given the checkbox picker of the demo app,
@@ -71,25 +68,13 @@ final class CheckboxPickerUITests: AppTestCase {
         tapButton(withWording: "app_components_checkbox_label", app)
         tapButton(withWording: "app_components_checkboxPicker_label", app)
 
-        check(value: selectedA11Yvalue, ofElementWithIdentifier: firstItemA11YIdentifier, app)
-        check(value: unselectedA11Yvalue, ofElementWithIdentifier: secondItemA11YIdentifier, app)
-        check(value: unselectedA11Yvalue, ofElementWithIdentifier: thirdItemA11YIdentifier, app)
-
-        // WHEN
-
-        var itemToSelect = otherElements(withA11yIdentifier: firstItemA11YIdentifier, app).firstMatch
-        itemToSelect.tap()
-
-        // THEN
-
-        check(value: pickerRootItemA11yValue(with: 0), ofElementWithLabel: rootItemA11YLabel, app)
         check(value: unselectedA11Yvalue, ofElementWithIdentifier: firstItemA11YIdentifier, app)
         check(value: unselectedA11Yvalue, ofElementWithIdentifier: secondItemA11YIdentifier, app)
         check(value: unselectedA11Yvalue, ofElementWithIdentifier: thirdItemA11YIdentifier, app)
 
         // WHEN
 
-        itemToSelect = otherElements(withA11yIdentifier: firstItemA11YIdentifier, app).firstMatch
+        var itemToSelect = otherElements(withA11yIdentifier: firstItemA11YIdentifier, app).firstMatch
         itemToSelect.tap()
 
         // THEN

DesignToolbox/DesignToolboxUITests/Components/Switches/SwitchItemUITests.swift

@@ -28,6 +28,7 @@ final class SwitchItemUITests: AppTestCase {
         swipeFromDownToUp(app)
         swipeFromDownToUp(app)
         tapButton(withWording: "app_components_switch_label", app)
+        waitForButtonToAppear(withWording: "Switch Item", app)
         tapButton(withWording: "Switch Item", app)
 
         let switchItem = otherElements(withA11yIdentifier: A11YIdentifiers.componentSwitchItem, app).firstMatch

DesignToolbox/DesignToolboxUITests/Utils/AppTestCase.swift

@@ -117,6 +117,13 @@ open class AppTestCase: XCTestCase {
 
     // MARK: - Helpers
 
+    @MainActor func waitForButtonToAppear(withWording key: String, _ app: XCUIApplication, _ timeout: TimeInterval = 5) {
+        let wording = wording(for: key)
+        let buttonToWaitFor = app.buttons[wording]
+        let doesButtonExist = buttonToWaitFor.waitForExistence(timeout: timeout)
+        XCTAssertTrue(doesButtonExist, "The button with wording '\(wording)' did not appear after \(timeout) seconds")
+    }
+
     /// Checks if the first element with this a11y identifier exists and has the wording with the given value as key
     @MainActor func check(value: String, ofElementWithIdentifier identifier: String, _ app: XCUIApplication) {
         let element = otherElements(withA11yIdentifier: identifier, app).firstMatch
@@ -126,7 +133,7 @@ open class AppTestCase: XCTestCase {
                 XCTAssertTrue(currentValue == expectedValue,
                               "The expected accessible value for the element is '\(expectedValue)' and not '\(currentValue)'")
             } else {
-                XCTFail("The value to comapre does not exist!")
+                XCTFail("The value to compare does not exist!")
             }
         } else {
             XCTFail("The element does not exists or the demo has been changed since!")