GitHub/GradientLoadingBar
1
0
Fork 0
mirror of https://github.com/fxm90/GradientLoadingBar.git synced 2026-06-16 12:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

🚨 :: Fix keyWindow deprecation warning

Browse Source
This commit is contained in:
Felix Mau
2022-03-10 13:58:36 +01:00
parent be40ac8c35
commit 03b9fac539
4 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Example/ExampleTests/ViewModel/GradientLoadingBarViewModelTestCase.swift
+9 -21
View File
@@ -47,9 +47,8 @@ final class GradientLoadingBarViewModelTestCase: XCTestCase {
func test_initializer_shouldSetupSuperviewObservable_withKeyWindow() {
// Given
let keyWindow = KeyWindow()
let passiveWindow = PassiveWindow()
sharedApplicationMock.windows = [keyWindow, passiveWindow]
let keyWindow = UIWindow()
sharedApplicationMock.keyWindowInConnectedScenes = keyWindow
// When
let viewModel = GradientLoadingBarViewModel(sharedApplication: sharedApplicationMock,
@@ -61,15 +60,15 @@ final class GradientLoadingBarViewModelTestCase: XCTestCase {
func test_initializer_shouldSetupSuperviewObservable_afterUIWindowDidBecomeKeyNotification() {
// Given
let keyWindow = KeyWindow()
let passiveWindow = PassiveWindow()
sharedApplicationMock.windows = [passiveWindow]
sharedApplicationMock.keyWindowInConnectedScenes = nil
let viewModel = GradientLoadingBarViewModel(sharedApplication: sharedApplicationMock,
notificationCenter: notificationCenter)
// When
sharedApplicationMock.windows.append(keyWindow)
let keyWindow = UIWindow()
sharedApplicationMock.keyWindowInConnectedScenes = keyWindow
notificationCenter.post(name: UIWindow.didBecomeKeyNotification,
object: nil)
@@ -79,9 +78,8 @@ final class GradientLoadingBarViewModelTestCase: XCTestCase {
func test_deinit_shouldResetSuperviewObservable_withNil() {
// Given
let keyWindow = KeyWindow()
let passiveWindow = PassiveWindow()
sharedApplicationMock.windows = [keyWindow, passiveWindow]
let keyWindow = UIWindow()
sharedApplicationMock.keyWindowInConnectedScenes = keyWindow
var viewModel: GradientLoadingBarViewModel? = GradientLoadingBarViewModel(sharedApplication: sharedApplicationMock,
notificationCenter: notificationCenter)
@@ -108,18 +106,8 @@ final class GradientLoadingBarViewModelTestCase: XCTestCase {
}
}
// MARK: - Helpers
private final class KeyWindow: UIWindow {
override var isKeyWindow: Bool { true }
}
private final class PassiveWindow: UIWindow {
override var isKeyWindow: Bool { false }
}
// MARK: - Mocks
private final class SharedApplicationMock: UIApplicationProtocol {
var windows = [UIWindow]()
var keyWindowInConnectedScenes: UIWindow?
}
Example/ExampleTests/Views/GradientActivityIndicatorView+AnimateIsHiddenTestCase.swift
+1 -1
View File
@@ -24,7 +24,7 @@ final class GradientActivityIndicatorViewAnimateIsHiddenTestCase: XCTestCase {
// In order for UIView animations to be executed correctly, the corresponding view has to be attached to a visible window.
// Therefore we're gonna use the current key-window, add our testing view here in `setUp()` and remove it later in `tearDown()`.
window = UIApplication.shared.windows.first { $0.isKeyWindow }
window = UIApplication.shared.keyWindowInConnectedScenes
gradientActivityIndicatorView = GradientActivityIndicatorView()
window.addSubview(gradientActivityIndicatorView)