progress

leancodepl · Nov 21, 2023 · 4d2fcf2 · 4d2fcf2
1 parent 68cc28b
commit 4d2fcf2
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/prepare.yaml b/.github/workflows/prepare.yaml
@@ -58,5 +58,6 @@ jobs:
             -scheme Landmarks \
             -only-testing LandmarksUITests \
             -configuration Debug \
-            -sdk iphoneos -destination 'platform=iOS Simulator,name=iPhone 14' \
+            -sdk iphoneos \
+            -destination 'platform=iOS Simulator,OS=16.2,name=iPhone 14' \
             | xcbeautify --renderer github-actions
diff --git a/Landmarks/Resources/landmarkData.json b/Landmarks/Resources/landmarkData.json
@@ -22,7 +22,7 @@
         "state": "Alaska",
         "id": 1002,
         "isFeatured": false,
-        "isFavorite": false,
+        "isFavorite": true,
         "park": "Lake Clark National Park and Preserve",
         "coordinates": {
             "longitude": -152.665167,

diff --git a/Landmarks/Views/Landmarks/LandmarkList.swift b/Landmarks/Views/Landmarks/LandmarkList.swift
@@ -14,6 +14,15 @@ struct LandmarkList: View {
     }
   }
 
+  func makeLabel(_ landmark: Landmark) -> String {
+    var label = landmark.name
+    if landmark.isFavorite {
+      label = label + ", favorited"
+    }
+
+    return label
+  }
+
   var body: some View {
     NavigationView {
       List {
@@ -25,6 +34,7 @@ struct LandmarkList: View {
             LandmarkDetail(landmark: landmark)
           } label: {
             LandmarkRow(landmark: landmark)
+              .accessibilityLabel(makeLabel(landmark))
           }
           .navigationTitle("Landmarks")
         }

diff --git a/Landmarks/Views/Landmarks/LandmarkRow.swift b/Landmarks/Views/Landmarks/LandmarkRow.swift
@@ -9,12 +9,14 @@ struct LandmarkRow: View {
         .resizable()
         .frame(width: 50, height: 50)
       Text(landmark.name)
+        .accessibilityHidden(true)
 
       Spacer()
 
       if landmark.isFavorite {
         Image(systemName: "star.fill")
           .foregroundColor(.yellow)
+          .accessibilityHidden(true)
       }
     }
   }

diff --git a/LandmarksUITests/LandmarksUITests.m b/LandmarksUITests/LandmarksUITests.m
@@ -22,23 +22,30 @@ - (void)testFavoriteUsingPredicates {
   // Open landmark page
   NSPredicate *predicate =
       [NSPredicate predicateWithFormat:@"label = %@", @"Turtle Rock"];
-  XCUIElementQuery *element = [[app descendantsMatchingType:XCUIElementTypeAny]
+  XCUIElementQuery *query = [[app descendantsMatchingType:XCUIElementTypeAny]
       matchingPredicate:predicate];
-  [[element firstMatch] tap];
+  [[query firstMatch] tap];
 
   // Mark landmark as favorite
   predicate = [NSPredicate predicateWithFormat:@"identifier = %@", @"favorite"];
-  element = [[app descendantsMatchingType:XCUIElementTypeAny]
+  query = [[app descendantsMatchingType:XCUIElementTypeAny]
       matchingPredicate:predicate];
-  [[element firstMatch] tap];
+  [[query firstMatch] tap];
 
   // Go to landmarks list
   predicate = [NSPredicate predicateWithFormat:@"label = %@", @"Landmarks"];
-  element = [[app descendantsMatchingType:XCUIElementTypeAny]
+  query = [[app descendantsMatchingType:XCUIElementTypeAny]
       matchingPredicate:predicate];
-  [[element firstMatch] tap];
+  [[query firstMatch] tap];
 
   // Assert that landmark is favorited
+  predicate = [NSPredicate
+      predicateWithFormat:@"label = %@", @"Turtle Rock, favorited"];
+  query = [[app descendantsMatchingType:XCUIElementTypeAny]
+      matchingPredicate:predicate];
+  XCUIElement *element = query.allElementsBoundByIndex.firstObject;
+
+  XCTAssertTrue(element.exists);
 }
 
 @end