Skip to content

Commit 892e677

Browse files
authored
Update tests for iOS 26 (#16220)
2 parents f49c71f + 6bf67c5 commit 892e677

File tree

3 files changed

+32
-12
lines changed

3 files changed

+32
-12
lines changed

Modules/Tests/YosemiteTests/Model/Extensions/OrderStatsV4Interval+DateTests.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ final class OrderStatsV4Interval_DateTests: XCTestCase {
1111
dateEnd: dateStringInSiteTimeZone,
1212
subtotals: mockIntervalSubtotals)
1313
// As long as the dates are parsed and formatted in the same time zone, they should be consistent.
14-
let timeZone = TimeZone(secondsFromGMT: 29302)!
14+
// Note that iOS 26 has changed behaviour here, and excess seconds in the timezone break the calculation
15+
// This is 488 minutes, or 8 hours and 8 minutes
16+
let timeZone = TimeZone(secondsFromGMT: 29280)!
1517
[interval.dateStart(timeZone: timeZone), interval.dateEnd(timeZone: timeZone)].forEach { date in
1618
let dateComponents = Calendar(identifier: .iso8601).dateComponents(in: timeZone, from: date)
1719
XCTAssertEqual(dateComponents.year, 2019)

Modules/Tests/YosemiteTests/Tools/Media/MediaTypeTests.swift

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ final class MediaTypeTests: XCTestCase {
2424

2525
func testInitWithAudioFileExtensions() throws {
2626
try XCTSkipIf(testingOnRosetta())
27-
// Note: "ogg" isn't supported on iOS.
28-
let audioFileExtensions = ["mp3", "m4a", "wav"]
27+
var audioFileExtensions = ["mp3", "m4a", "wav"]
28+
// Note: "ogg" is only supported on iOS 26 and above.
29+
if #available(iOS 26.0, *) {
30+
audioFileExtensions.append("ogg")
31+
}
32+
2933
audioFileExtensions.forEach { fileExtension in
3034
XCTAssertEqual(MediaType(fileExtension: fileExtension), .audio, "Unexpected media type for file extension: \(fileExtension)")
3135
}
@@ -41,11 +45,16 @@ final class MediaTypeTests: XCTestCase {
4145

4246
func testInitWithOtherFileExtensions() throws {
4347
try XCTSkipIf(testingOnRosetta())
44-
let presentationFileExtensions = [
48+
var presentationFileExtensions = [
4549
"pdf", "doc", "odt", "xls", "xlsx",
46-
// Audio/video formats that are not supported on iOS
47-
"ogg", "ogv"
50+
// Video formats that are not supported on iOS
51+
"ogv"
4852
]
53+
54+
// Note: "ogg" is only supported on iOS 26 and above.
55+
if #unavailable(iOS 26.0) {
56+
presentationFileExtensions.append("ogg")
57+
}
4958
presentationFileExtensions.forEach { fileExtension in
5059
XCTAssertEqual(MediaType(fileExtension: fileExtension), .other, "Unexpected media type for file extension: \(fileExtension)")
5160
}
@@ -80,7 +89,11 @@ final class MediaTypeTests: XCTestCase {
8089

8190
func testInitWithAudioMimeType() throws {
8291
try XCTSkipIf(testingOnRosetta())
83-
let audioMimeTypes = ["audio/midi", "audio/x-midi", "audio/mpeg", "audio/wav"]
92+
var audioMimeTypes = ["audio/midi", "audio/x-midi", "audio/mpeg", "audio/wav"]
93+
// Note: "ogg" is only supported on iOS 26 and above.
94+
if #available(iOS 26.0, *) {
95+
audioMimeTypes.append("audio/ogg")
96+
}
8497
audioMimeTypes.forEach { mimeType in
8598
XCTAssertEqual(MediaType(mimeType: mimeType), .audio, "Unexpected media type for file extension: \(mimeType)")
8699
}
@@ -96,14 +109,19 @@ final class MediaTypeTests: XCTestCase {
96109

97110
func testInitWithOtherMimeType() throws {
98111
try XCTSkipIf(testingOnRosetta())
99-
let otherMimeTypes = [
112+
var otherMimeTypes = [
100113
"application/pdf", "application/msword", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
101114
"application/vnd.oasis.opendocument.text", "application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
102115
// Video formats that are not supported on iOS
103116
"video/ogg", "video/mp2t", "video/webm",
104117
// Audio formats that are not supported on iOS
105-
"audio/ogg", "audio/opus", "audio/webm"
118+
"audio/opus", "audio/webm"
106119
]
120+
121+
// Note: "ogg" is only supported on iOS 26 and above.
122+
if #unavailable(iOS 26.0) {
123+
otherMimeTypes.append("audio/ogg")
124+
}
107125
otherMimeTypes.forEach { mimeType in
108126
XCTAssertEqual(MediaType(mimeType: mimeType), .other, "Unexpected media type for file extension: \(mimeType)")
109127
}

WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)