Skip to content

Commit e0e5a1e

Browse files
committed
Use xcode latest-stable and fix CI
1 parent f13eed6 commit e0e5a1e

File tree

6 files changed

+153
-219
lines changed

6 files changed

+153
-219
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ jobs:
1818
matrix:
1919
include:
2020
- macos: macos-latest
21-
ios: "18.4"
22-
xcode: "26.1"
21+
ios: "18.6"
22+
xcode: latest-stable
2323
device: "iPhone 16 Pro"
24-
- macos: macos-latest
25-
ios: "26.1"
26-
xcode: "26.1"
24+
- macos: macos-26
25+
ios: "26.2"
2726
device: "iPhone 17 Pro"
2827
runs-on: ${{ matrix.macos }}
2928
steps:
3029
- uses: maxim-lobanov/setup-xcode@v1
30+
if: ${{ matrix.xcode }}
3131
with:
3232
xcode-version: ${{ matrix.xcode }}
3333
- uses: actions/checkout@v4
@@ -53,16 +53,16 @@ jobs:
5353
matrix:
5454
include:
5555
- macos: macos-latest
56-
ios: "18.4"
57-
xcode: "26.1"
56+
ios: "18.6"
57+
xcode: latest-stable
5858
device: "iPhone 16 Pro"
59-
- macos: macos-latest
60-
ios: "26.1"
61-
xcode: "26.1"
59+
- macos: macos-26
60+
ios: "26.2"
6261
device: "iPhone 17 Pro"
6362
runs-on: ${{ matrix.macos }}
6463
steps:
6564
- uses: maxim-lobanov/setup-xcode@v1
65+
if: ${{ matrix.xcode }}
6666
with:
6767
xcode-version: ${{ matrix.xcode }}
6868
- uses: actions/checkout@v4

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.6
1+
3.4.8

Gemfile.lock

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ GEM
88
artifactory (3.0.17)
99
atomos (0.1.3)
1010
aws-eventstream (1.4.0)
11-
aws-partitions (1.1190.0)
12-
aws-sdk-core (3.239.2)
11+
aws-partitions (1.1198.0)
12+
aws-sdk-core (3.240.0)
1313
aws-eventstream (~> 1, >= 1.3.0)
1414
aws-partitions (~> 1, >= 1.992.0)
1515
aws-sigv4 (~> 1.9)
@@ -20,15 +20,15 @@ GEM
2020
aws-sdk-kms (1.118.0)
2121
aws-sdk-core (~> 3, >= 3.239.1)
2222
aws-sigv4 (~> 1.5)
23-
aws-sdk-s3 (1.206.0)
23+
aws-sdk-s3 (1.209.0)
2424
aws-sdk-core (~> 3, >= 3.234.0)
2525
aws-sdk-kms (~> 1)
2626
aws-sigv4 (~> 1.5)
2727
aws-sigv4 (1.12.1)
2828
aws-eventstream (~> 1, >= 1.0.2)
2929
babosa (1.0.4)
3030
base64 (0.2.0)
31-
bigdecimal (3.3.1)
31+
bigdecimal (4.0.1)
3232
claide (1.1.0)
3333
colored (1.2)
3434
colored2 (3.1.2)
@@ -71,7 +71,7 @@ GEM
7171
faraday_middleware (1.2.1)
7272
faraday (~> 1.0)
7373
fastimage (2.4.0)
74-
fastlane (2.229.1)
74+
fastlane (2.230.0)
7575
CFPropertyList (>= 2.3, < 4.0.0)
7676
abbrev (~> 0.1.2)
7777
addressable (>= 2.8, < 3.0.0)
@@ -100,6 +100,7 @@ GEM
100100
http-cookie (~> 1.0.5)
101101
json (< 3.0.0)
102102
jwt (>= 2.1.0, < 3)
103+
logger (>= 1.6, < 2.0)
103104
mini_magick (>= 4.9.4, < 5.0.0)
104105
multipart-post (>= 2.0.0, < 3.0.0)
105106
mutex_m (~> 0.3.0)
@@ -163,7 +164,7 @@ GEM
163164
httpclient (2.9.0)
164165
mutex_m
165166
jmespath (1.6.2)
166-
json (2.17.1)
167+
json (2.18.0)
167168
jwt (2.10.2)
168169
base64
169170
logger (1.7.0)
@@ -175,7 +176,7 @@ GEM
175176
nanaimo (0.4.0)
176177
naturally (2.3.0)
177178
nkf (0.2.0)
178-
optparse (0.8.0)
179+
optparse (0.8.1)
179180
os (1.1.4)
180181
plist (3.7.2)
181182
public_suffix (7.0.0)

SF50 TOLDUITests/Extensions.swift

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import XCTest
33
extension XCUIElement {
44
var isVisible: Bool {
55
guard self.exists && !self.frame.isEmpty else { return false }
6-
return XCUIApplication().windows.element(boundBy: 0).frame.contains(self.frame)
6+
let app = XCUIApplication()
7+
guard let firstWindow = app.windows.allElementsBoundByIndex.first else { return false }
8+
return firstWindow.frame.contains(self.frame)
79
}
810

911
func toggleOn() {
@@ -76,9 +78,6 @@ extension XCUIElement {
7678
func clearAndType(_ text: String, app: XCUIApplication) {
7779
tap()
7880

79-
// Wait a moment for field to be focused and keyboard/popover to appear
80-
Thread.sleep(forTimeInterval: 0.2)
81-
8281
// Dismiss keyboard popover on iPad if present
8382
if app.otherElements["PopoverDismissRegion"].exists {
8483
app.otherElements["PopoverDismissRegion"].tap()
@@ -87,17 +86,14 @@ extension XCUIElement {
8786
// Triple tap to select all
8887
tap(withNumberOfTaps: 3, numberOfTouches: 1)
8988

90-
// Small delay for selection
91-
Thread.sleep(forTimeInterval: 0.1)
92-
9389
// Type new text (will replace selection)
9490
typeText(text)
9591
}
9692
}
9793

98-
// Helper for waiting
94+
// No-op placeholder for navigation timing - rely on waitForExistence instead
9995
func waitForNavigation() {
100-
Thread.sleep(forTimeInterval: 0.5)
96+
// Intentionally empty - navigation timing is handled by waitForExistence calls
10197
}
10298

10399
// Helper to tap element and ensure navigation occurred

0 commit comments

Comments
 (0)