[#21] Rebase

blyscuit · Dec 20, 2022 · 2422f15 · 2422f15
1 parent ebb18c1
commit 2422f15
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/model/UserApiModel.kt b/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/model/UserApiModel.kt
@@ -1,5 +1,6 @@
 package co.nimblehq.blisskmmic.data.model
 
+import co.nimblehq.blisskmmic.domain.model.Survey
 import co.nimblehq.blisskmmic.domain.model.User
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -11,10 +12,9 @@ data class UserApiModel(
     val email: String,
     val name: String,
     @SerialName("avatar_url") val avatarUrl: String
-) {
+)
 
-    fun toUser(): User = User(
-        name,
-        avatarUrl
-    )
-}
+fun UserApiModel.toUser() = User(
+    name,
+    avatarUrl
+)
diff --git a/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/repository/UserRepositoryImpl.kt b/shared/src/commonMain/kotlin/co/nimblehq/blisskmmic/data/repository/UserRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package co.nimblehq.blisskmmic.data.repository
 
+import co.nimblehq.blisskmmic.data.model.toUser
 import co.nimblehq.blisskmmic.data.network.datasource.NetworkDataSource
 import co.nimblehq.blisskmmic.data.network.target.UserProfileTargetType
 import co.nimblehq.blisskmmic.domain.model.User

diff --git a/.../commonTest/kotlin/co/nimblehq/blisskmmic/data/repository/AuthenticationRepositoryTest.kt b/.../commonTest/kotlin/co/nimblehq/blisskmmic/data/repository/AuthenticationRepositoryTest.kt
@@ -118,7 +118,7 @@ class AuthenticationRepositoryTest: TestsWithMocks() {
     }
 
     @Test
-    fun `When calling hasCachedToken, it returns true when there is a token`() = runTest {
+    fun `When calling hasCachedToken- it returns true when there is a token`() = runTest {
         mocker.every {
             localDataSource.getToken()
         } returns flowOf(tokenDB)
@@ -132,7 +132,7 @@ class AuthenticationRepositoryTest: TestsWithMocks() {
     }
 
     @Test
-    fun `When calling hasCachedToken, it returns false when there is an error`() = runTest {
+    fun `When calling hasCachedToken- it returns false when there is an error`() = runTest {
         mocker.every {
             localDataSource.getToken()
         } returns flow { error("No token") }

diff --git a/shared/src/commonTest/kotlin/co/nimblehq/blisskmmic/domain/usecase/CheckLoginUseCaseTest.kt b/shared/src/commonTest/kotlin/co/nimblehq/blisskmmic/domain/usecase/CheckLoginUseCaseTest.kt
@@ -27,7 +27,7 @@ class CheckLoginUseCaseTest {
     }
 
     @Test
-    fun `When calling check with response true, it returns true`() = runTest {
+    fun `When calling check with response true- it returns true`() = runTest {
         mocker.every {
             authenticationRepository.hasCachedToken()
         } returns flowOf(true)
@@ -40,7 +40,7 @@ class CheckLoginUseCaseTest {
     }
 
     @Test
-    fun `When calling check with response false, it returns false`() = runTest {
+    fun `When calling check with response false- it returns false`() = runTest {
         mocker.every {
             authenticationRepository.hasCachedToken()
         } returns flowOf(false)
@@ -53,7 +53,7 @@ class CheckLoginUseCaseTest {
     }
 
     @Test
-    fun `When calling check with a failure response, it returns correct error`() = runTest {
+    fun `When calling check with a failure response- it returns correct error`() = runTest {
         mocker.every {
             authenticationRepository.hasCachedToken()
         } returns flow { error("Fail") }

diff --git a/shared/src/commonTest/kotlin/co/nimblehq/blisskmmic/extension/StringRegexTest.kt b/shared/src/commonTest/kotlin/co/nimblehq/blisskmmic/extension/StringRegexTest.kt
@@ -9,7 +9,7 @@ import kotlin.test.assertTrue
 class StringRegexTest {
 
     @Test
-    fun `When calling isValidEmail emails, it returns correct validity`() {
+    fun `When calling isValidEmail emails- it returns correct validity`() {
         "a@a.co.uk".isValidEmail() shouldBe true
         "ab.cd@abc.org".isValidEmail() shouldBe true
         "a@a.com".isValidEmail() shouldBe true

diff --git a/...commonTest/kotlin/co/nimblehq/blisskmmic/presentation/modules/login/LoginViewModelTest.kt b/...commonTest/kotlin/co/nimblehq/blisskmmic/presentation/modules/login/LoginViewModelTest.kt
@@ -77,7 +77,7 @@ class LoginViewModelTest : TestsWithMocks() {
     }
 
     @Test
-    fun `When calling login with an invalid email, it changes viewState to error`() = runTest {
+    fun `When calling login with an invalid email- it changes viewState to error`() = runTest {
         loginViewModel.login("invalid", password)
 
         val result = loginViewModel
@@ -88,7 +88,7 @@ class LoginViewModelTest : TestsWithMocks() {
     }
 
     @Test
-    fun `When calling login with an empty password, it changes viewState to error`() = runTest {
+    fun `When calling login with an empty password- it changes viewState to error`() = runTest {
         loginViewModel.login(email, "")
 
         val result = loginViewModel

diff --git a/...mmonTest/kotlin/co/nimblehq/blisskmmic/presentation/modules/splash/SplashViewModelTest.kt b/...mmonTest/kotlin/co/nimblehq/blisskmmic/presentation/modules/splash/SplashViewModelTest.kt
@@ -44,7 +44,7 @@ class SplashViewModelTest : TestsWithMocks() {
     }
 
     @Test
-    fun `When calling checkLogin with true response, it changes viewState correctly`() = runTest {
+    fun `When calling checkLogin with true response- it changes viewState correctly`() = runTest {
         mocker.every {
             checkLoginUseCase()
         } returns flowOf(true)
@@ -63,7 +63,7 @@ class SplashViewModelTest : TestsWithMocks() {
     }
 
     @Test
-    fun `When calling checkLogin with false response, it changes viewState correctly`() = runTest {
+    fun `When calling checkLogin with false response- it changes viewState correctly`() = runTest {
         mocker.every {
             checkLoginUseCase()
         } returns flow{
@@ -85,7 +85,7 @@ class SplashViewModelTest : TestsWithMocks() {
     }
 
     @Test
-    fun `When calling checkLogin with faliure response, it changes viewState correctly`() = runTest {
+    fun `When calling checkLogin with faliure response- it changes viewState correctly`() = runTest {
         mocker.every {
             checkLoginUseCase()
         } returns flow {