Skip to content

Commit 2c48e96

Browse files
committed
Fix PinSafeAreaWithOptInInsetsUpdateModeSpec
1 parent 0094cb7 commit 2c48e96

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

Tests/iOS/PinSafeAreaTests.swift

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,24 +533,34 @@ class PinSafeAreaWithOptInInsetsUpdateModeSpec: QuickSpec {
533533
Pin.safeAreaInsetsDidChangeMode = .optIn
534534

535535
let mainView = viewController.mainView
536-
536+
let subViewTop = CGFloat(10)
537+
let subViewLeft = CGFloat(10)
538+
537539
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
538-
subView.pin.top(10).left(10).size(100)
540+
subView.pin.top(subViewTop).left(subViewLeft).size(100)
539541
}
540542

541543
navigationController.navigationBar.isTranslucent = true
542544
setupWindow(with: navigationController)
545+
546+
let expectedSafeAreaInsets = mainView.safeAreaInsets
547+
let expectedSubViewSafeAreaInsets = UIEdgeInsets(
548+
top: expectedSafeAreaInsets.top - subViewTop,
549+
left: .zero,
550+
bottom: .zero,
551+
right: .zero
552+
)
543553

544554
// MATCH safeAreaInsets!
545555
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
546-
// expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
556+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
547557

548-
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))
549-
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
558+
expect(mainView.pin.safeArea).to(equal(expectedSafeAreaInsets))
559+
expect(mainView.subView.pin.safeArea).to(equal(expectedSubViewSafeAreaInsets))
550560
expect(mainView.subView.subViewB!.pin.safeArea).to(equal(UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0)))
551561

552562
expect(mainView.subView.frame).to(equal(CGRect(x: 10, y: 10, width: 100, height: 100)))
553-
expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: 34, width: 40, height: 40)))
563+
expect(mainView.subView.subViewB!.frame).to(equal(CGRect(x: 0, y: expectedSubViewSafeAreaInsets.top, width: 40, height: 40)))
554564
}
555565
}
556566
}

0 commit comments

Comments
 (0)