[#19] Fix lint and test

blyscuit · Jan 5, 2023 · 7e8640e · 7e8640e
1 parent 80d7813
commit 7e8640e
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/iosApp/SurveyKIFUITests/Sources/Screens/LoginScreen.swift b/iosApp/SurveyKIFUITests/Sources/Screens/LoginScreen.swift
@@ -9,7 +9,12 @@
 final class LoginScreen: GenericScreen {
 
     func loginIfNeeded() {
-        tester.waitForAbsenceOfView(withAccessibilityIdentifier: ViewId.splash(.view)())
+        if tester.tryFindingView(withAccessibilityIdentifier: ViewId.surveySelection(.view)()) {
+            return
+        }
+        if tester.tryFindingView(withAccessibilityIdentifier: ViewId.splash(.view)()) {
+            tester.waitForAbsenceOfView(withAccessibilityIdentifier: ViewId.splash(.view)())
+        }
         if tester.tryFindingView(withAccessibilityIdentifier: ViewId.login(.view)()) {
             tester.waitForTappableView(withAccessibilityIdentifier: ViewId.login(.loginButton)())
             tester.tapView(withAccessibilityIdentifier: ViewId.login(.loginButton)())

diff --git a/iosApp/SurveyKIFUITests/Sources/Screens/SurveyScreen.swift b/iosApp/SurveyKIFUITests/Sources/Screens/SurveyScreen.swift
@@ -8,7 +8,12 @@
 
 final class SurveyScreen: GenericScreen {
 
+    func waitForAppearance() {
+        tester.waitForView(withAccessibilityIdentifier: ViewId.surveySelection(.view)())
+    }
+
     func navigateToAccount() {
+        waitForAppearance()
         tester.tapView(withAccessibilityIdentifier: ViewId.surveySelection(.headerProfileImage)())
     }
 

diff --git a/iosApp/SurveyKIFUITests/Sources/Specs/Presentation/Module/SurveySelectionSpec.swift b/iosApp/SurveyKIFUITests/Sources/Specs/Presentation/Module/SurveySelectionSpec.swift
@@ -27,7 +27,7 @@ final class SurveySelectionSpec: QuickSpec {
 
                 beforeEach {
                     loginScreen.loginIfNeeded()
-                    surveyScreen.navigateToAccount()
+                    surveyScreen.waitForAppearance()
                 }
 
                 describe("its image area") {

diff --git a/...ources/Specs/Presentation/Modules/SurveySelection/SurveySelectionViewDataSourceSpec.swift b/...ources/Specs/Presentation/Modules/SurveySelection/SurveySelectionViewDataSourceSpec.swift
@@ -88,7 +88,7 @@ final class SurveySelectionViewDataSourceSpec: QuickSpec {
                 describe("its checkFetchMore") {
 
                     beforeEach {
-                        try? self.awaitPublisher(dataSource.$surveys.collectNext(2))
+                        _ = try? self.awaitPublisher(dataSource.$surveys.collectNext(2))
                         delayCheckFetchMore()
                     }
 

diff --git a/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/database/core/DataStore.kt b/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/database/core/DataStore.kt
@@ -44,6 +44,6 @@ class DataStoreImpl(private val settings: Settings): DataStore {
         settings
             .keys
             .filter { it.startsWith(key) }
-            .map { settings.removeObject(it) }
+            .map { settings.remove(it) }
     }
 }
diff --git a/.../nimblehq/blisskmmic/presentation/modules/surveyselection/SurveySelectionViewModelTest.kt b/.../nimblehq/blisskmmic/presentation/modules/surveyselection/SurveySelectionViewModelTest.kt
@@ -1,3 +1,4 @@
+@file:Suppress("MagicNumber")
 package co.nimblehq.blisskmmic.presentation.modules.surveyselection
 
 import app.cash.turbine.test
@@ -210,7 +211,7 @@ class SurveySelectionViewModelTest : TestsWithMocks() {
     fun `When calling checkFetchMore fetch correct index - it changes viewState with correct item`() = runTest {
         mocker.every {
             getCurrentDateUseCase()
-        } returns delayFlowOf(dateComponent)
+        } returns delayFlowOf(TIME)
         mocker.every {
             getProfileUseCase()
         } returns flowOf(user)
@@ -240,7 +241,7 @@ class SurveySelectionViewModelTest : TestsWithMocks() {
     fun `When calling checkFetchMore fetch incompleted index - it does not fetch more`() = runTest {
         mocker.every {
             getCurrentDateUseCase()
-        } returns delayFlowOf(dateComponent)
+        } returns delayFlowOf(TIME)
         mocker.every {
             getProfileUseCase()
         } returns flowOf(user)