Skip to content

Fix tests #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

Fix tests #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/swift.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:

jobs:
build:
runs-on: macos-13
runs-on: macos-15
strategy:
matrix:
xcode:
- '15.0' # Swift 5.9
- '18.0' # Swift 6
steps:
- uses: actions/checkout@v4
- name: Build
run: xcodebuild clean build -scheme MagazineLayout -destination "generic/platform=iOS Simulator"
- name: Run tests
run: xcodebuild clean test -project MagazineLayout.xcodeproj -scheme MagazineLayout -destination "name=iPhone 14,OS=17.2"
run: xcodebuild clean test -project MagazineLayout.xcodeproj -scheme MagazineLayout -destination "name=iPhone 16,OS=18.4"
1 change: 1 addition & 0 deletions Tests/ModelStateEmptySectionLayoutTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import XCTest

@testable import MagazineLayout

@available(iOS 18.0, *)
final class ModelStateEmptySectionLayoutTests: XCTestCase {

// MARK: Internal
Expand Down
1 change: 1 addition & 0 deletions Tests/ModelStateLayoutTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import XCTest

@testable import MagazineLayout

@available(iOS 18.0, *)
final class ModelStateLayoutTests: XCTestCase {

// MARK: Internal
Expand Down
31 changes: 2 additions & 29 deletions Tests/TestingSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ final class ModelHelpers {

// MARK: - FrameHelpers

@available(iOS 18.0, *)
final class FrameHelpers {

static func expectedFrames(
Expand Down Expand Up @@ -187,6 +188,7 @@ final class FrameHelpers {

// MARK: - Remove duplicates

@available(iOS 18.0, *)
extension Array where Element == CGRect {

func removingDuplicates() -> [Element] {
Expand All @@ -205,35 +207,6 @@ extension Array where Element == CGRect {

}

// MARK: Hashable

extension CGRect: Hashable {

public func hash(into hasher: inout Hasher) {
hasher.combine(size)
hasher.combine(origin)
}

}

extension CGSize: Hashable {

public func hash(into hasher: inout Hasher) {
hasher.combine(height)
hasher.combine(width)
}

}

extension CGPoint: Hashable {

public func hash(into hasher: inout Hasher) {
hasher.combine(x)
hasher.combine(y)
}

}

// MARK: - DebugHelpers

final class DebugHelpers {
Expand Down