Skip to content

Commit 549aba4

Browse files
antoinelamyantoinelamy
committed
Change safe area tests to expect at least one safe area did change call instead of an exact number of calls
1 parent 95e261b commit 549aba4

File tree

1 file changed

+21
-84
lines changed

1 file changed

+21
-84
lines changed

‎Tests/iOS/PinSafeAreaTests.swift‎

Lines changed: 21 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ class PinSafeAreaSpec: QuickSpec {
8383
describe("using translucent NavigationBar") {
8484
it("default") {
8585
let mainView = viewController.mainView
86-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
87-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
88-
}
8986

9087
mainView.layoutOffsetViewClosure = { (_ offsetView: UIView, _ parent: UIView) in
9188
offsetView.pin.all().margin(parent.pin.safeArea)
@@ -103,7 +100,7 @@ class PinSafeAreaSpec: QuickSpec {
103100
}
104101
XCTAssertEqual(mainView.pin.safeArea, expectedSafeAreaInsets)
105102
XCTAssertEqual(mainView.offsetView.pin.safeArea, expectedOffsetViewSafeAreaInsets)
106-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
103+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
107104

108105
let screenSize = mainView.frame.size
109106
XCTAssertEqual(mainView.frame, CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height))
@@ -112,9 +109,6 @@ class PinSafeAreaSpec: QuickSpec {
112109

113110
it("with OffsetView") {
114111
let mainView = viewController.mainView
115-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
116-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
117-
}
118112

119113
mainView.layoutOffsetViewClosure = { (_ offsetView: UIView, _ parent: UIView) in
120114
offsetView.pin.top(10).width(100).height(100)
@@ -136,14 +130,11 @@ class PinSafeAreaSpec: QuickSpec {
136130
let screenSize = mainView.frame.size
137131
XCTAssertEqual(mainView.frame, CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height))
138132
XCTAssertEqual(mainView.offsetView.frame, CGRect(x: 0, y: 10, width: 100, height: 100))
139-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
133+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
140134
}
141135

142136
it("with OffsetView and AdditionalSafeAreaInsets") {
143137
let mainView = viewController.mainView
144-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
145-
if #available(iOS 11.0, tvOS 11.0, *) { return 2 } else { return 3 }
146-
}
147138

148139
mainView.layoutOffsetViewClosure = { (_ offsetView: UIView, _ parent: UIView) in
149140
offsetView.pin.all().margin(parent.pin.safeArea)
@@ -176,17 +167,14 @@ class PinSafeAreaSpec: QuickSpec {
176167
}
177168
XCTAssertEqual(mainView.pin.safeArea, expectedSafeAreaInsets)
178169
XCTAssertEqual(mainView.offsetView.pin.safeArea, expectedOffsetViewSafeAreaInsets)
179-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
170+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
180171

181172
XCTAssertEqual(mainView.frame, CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height))
182173
XCTAssertEqual(mainView.offsetView.frame, expectedOffsetViewFrame)
183174
}
184175

185176
it("with OffsetView and AdditionalSafeAreaInsets 2") {
186177
let mainView = viewController.mainView
187-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
188-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
189-
}
190178

191179
mainView.layoutOffsetViewClosure = { (_ offsetView: UIView, _ parent: UIView) in
192180
offsetView.pin.top(10).width(100).height(100)
@@ -212,7 +200,7 @@ class PinSafeAreaSpec: QuickSpec {
212200
}
213201
XCTAssertEqual(mainView.pin.safeArea, expectedSafeAreaInsets)
214202
XCTAssertEqual(mainView.offsetView.pin.safeArea, expectedOffsetViewSafeAreaInsets)
215-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
203+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
216204
}
217205
}
218206
}
@@ -286,12 +274,6 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
286274
describe("navigationbar + subview") {
287275
it("transluscent navigationbar 1") {
288276
let mainView = viewController.mainView
289-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
290-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
291-
}
292-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
293-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 2 }
294-
}
295277

296278
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
297279
subView.pin.top(10).left(10).size(100)
@@ -301,8 +283,8 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
301283
setupWindow(with: navigationController)
302284

303285
// MATCH safeAreaInsets!
304-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
305-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
286+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
287+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
306288

307289
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))
308290
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
@@ -314,12 +296,6 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
314296

315297
it("transluscent navigationbar 2") {
316298
let mainView = viewController.mainView
317-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
318-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
319-
}
320-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
321-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 2 }
322-
}
323299

324300
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
325301
subView.pin.top(10).left(-10).size(100)
@@ -329,8 +305,8 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
329305
setupWindow(with: navigationController)
330306

331307
// MATCH safeAreaInsets!
332-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
333-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
308+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
309+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
334310

335311
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))
336312
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
@@ -342,12 +318,6 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
342318

343319
it("transluscent navigationbar 3") {
344320
let mainView = viewController.mainView
345-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
346-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
347-
}
348-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
349-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 2 }
350-
}
351321

352322
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
353323
subView.pin.top(10).right(10).size(100)
@@ -357,8 +327,8 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
357327
setupWindow(with: navigationController)
358328

359329
// MATCH safeAreaInsets!
360-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
361-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
330+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
331+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
362332

363333
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))
364334
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
@@ -371,12 +341,6 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
371341

372342
it("transluscent navigationbar 4") {
373343
let mainView = viewController.mainView
374-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
375-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
376-
}
377-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
378-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 2 }
379-
}
380344

381345
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
382346
subView.pin.top(10).right(-10).size(100)
@@ -386,8 +350,8 @@ class PinSafeAreaMoreTestsSpec: QuickSpec {
386350
setupWindow(with: navigationController)
387351

388352
// MATCH safeAreaInsets!
389-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
390-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
353+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
354+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
391355

392356
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))
393357
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
@@ -452,12 +416,6 @@ class PinSafeAreaWithOptInModeSpec: QuickSpec {
452416
describe("using Pin.safeAreaInsetsDidChangeMode = .optIn") {
453417
it("should not call safeAreaInsetsDidChange()") {
454418
let mainView = viewController.mainView
455-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
456-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 0 }
457-
}
458-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
459-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 0 }
460-
}
461419

462420
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
463421
subView.pin.top(10).left(10).size(100)
@@ -467,8 +425,8 @@ class PinSafeAreaWithOptInModeSpec: QuickSpec {
467425
setupWindow(with: navigationController)
468426

469427
// MATCH safeAreaInsets!
470-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
471-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
428+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
429+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
472430

473431
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))
474432
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
@@ -513,12 +471,6 @@ class PinSafeAreaWithOptInInsetsUpdateModeSpec: QuickSpec {
513471
Pin.safeAreaInsetsDidChangeMode = .optIn
514472

515473
let mainView = viewController.mainView
516-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
517-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
518-
}
519-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
520-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 0 }
521-
}
522474

523475
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
524476
subView.pin.top(10).left(10).size(100)
@@ -528,8 +480,8 @@ class PinSafeAreaWithOptInInsetsUpdateModeSpec: QuickSpec {
528480
setupWindow(with: navigationController)
529481

530482
// MATCH safeAreaInsets!
531-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
532-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
483+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
484+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
533485

534486
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))
535487
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
@@ -579,12 +531,6 @@ class PinSafeAreaTabBarControllerSpec: QuickSpec {
579531
describe("navigationbar + tabbar + subview") {
580532
it("translucent navigation bar") {
581533
let mainView = viewController.mainView
582-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
583-
if #available(iOS 11.0, tvOS 11.0, *) { return 2 } else { return 4 }
584-
}
585-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
586-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 2 }
587-
}
588534

589535
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
590536
subView.pin.top(10).left(10).size(100)
@@ -595,8 +541,8 @@ class PinSafeAreaTabBarControllerSpec: QuickSpec {
595541
setupWindow(with: navigationController)
596542

597543
// MATCH safeAreaInsets!
598-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
599-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
544+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
545+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
600546

601547
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 49.0, right: 0.0)))
602548
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 34.0, left: 0.0, bottom: 0.0, right: 0.0)))
@@ -612,12 +558,6 @@ class PinSafeAreaTabBarControllerSpec: QuickSpec {
612558
describe("navigationbar + tabbar + subview") {
613559
it("transluscent navigationbar 2") {
614560
let mainView = viewController.mainView
615-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
616-
if #available(iOS 11.0, tvOS 11.0, *) { return 2 } else { return 4 }
617-
}
618-
var expectedSubViewSafeAreaInsetsDidChangeCalledCount: Int {
619-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 2 }
620-
}
621561

622562
mainView.layoutOffsetViewClosure = { (_ subView: UIView, _ parent: UIView) in
623563
subView.pin.all()
@@ -627,8 +567,8 @@ class PinSafeAreaTabBarControllerSpec: QuickSpec {
627567
setupWindow(with: navigationController)
628568

629569
// MATCH safeAreaInsets!
630-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
631-
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSubViewSafeAreaInsetsDidChangeCalledCount))
570+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
571+
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount) > 0
632572

633573
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 49.0, right: 0.0)))
634574
expect(mainView.subView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 49.0, right: 0.0)))
@@ -674,15 +614,12 @@ class PinSafeAreaScrollViewControllerSpec: QuickSpec {
674614
describe("navigationbar + scrollview") {
675615
it("translucent navigation bar") {
676616
let mainView = viewController.mainView
677-
var expectedSafeAreaInsetsDidChangeCalledCount: Int {
678-
if #available(iOS 11.0, tvOS 11.0, *) { return 1 } else { return 3 }
679-
}
680617

681618
navigationController.navigationBar.isTranslucent = true
682619
setupWindow(with: navigationController)
683620

684621
// MATCH safeAreaInsets!
685-
expect(mainView.safeAreaInsetsDidChangeCalledCount).to(equal(expectedSafeAreaInsetsDidChangeCalledCount))
622+
expect(mainView.safeAreaInsetsDidChangeCalledCount) > 0
686623
expect(mainView.subView.safeAreaInsetsDidChangeCalledCount).to(equal(0))
687624

688625
expect(mainView.pin.safeArea).to(equal(UIEdgeInsets(top: 44.0, left: 0.0, bottom: 0.0, right: 0.0)))

0 commit comments

Comments
 (0)