Skip to content

Commit

Permalink
Merge pull request #35 from NaJuDoRyeong/feature/#33-sign_up
Browse files Browse the repository at this point in the history
Feature/#33 sign up
  • Loading branch information
KDW03 authored Sep 30, 2023
2 parents b6f434a + 3ce2057 commit ad889a4
Show file tree
Hide file tree
Showing 512 changed files with 413 additions and 429 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Run all local screenshot tests (Roborazzi)
id: screenshotsverify
continue-on-error: true
run: ./gradlew verifyRoborazziDemoDebug --stacktrace --info
run: ./gradlew verifyRoborazziDemoDebug

- name: Prevent pushing new screenshots if this is a fork
id: checkfork
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

151 changes: 0 additions & 151 deletions .idea/androidTestResultsUserPreferences.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

57 changes: 0 additions & 57 deletions .idea/gradle.xml

This file was deleted.

41 changes: 0 additions & 41 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/kotlinc.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

26 changes: 20 additions & 6 deletions app/src/androidTest/java/com/najudoryeong/mineme/NavigationTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,27 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.espresso.Espresso
import androidx.test.espresso.NoActivityResumedException
import com.najudoryeong.mineme.core.model.data.DarkThemeConfig
import com.najudoryeong.mineme.core.model.data.UserData
import com.najudoryeong.mineme.core.testing.repository.TestUserDataRepository
import com.najudoryeong.mineme.core.ui.HomeUiState
import com.najudoryeong.mineme.core.ui.MainActivityUiState
import com.najudoryeong.mineme.core.ui.RegionStoryUiState
import dagger.hilt.android.testing.BindValue
import dagger.hilt.android.testing.HiltAndroidRule
import dagger.hilt.android.testing.HiltAndroidTest
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import kotlinx.coroutines.test.UnconfinedTestDispatcher
import kotlinx.coroutines.test.runTest
import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.rules.TemporaryFolder
import javax.inject.Inject
import kotlin.properties.ReadOnlyProperty
import kotlin.test.assertEquals
import kotlin.test.assertTrue
import com.najudoryeong.mineme.feature.home.R as FeatureHomeR
import com.najudoryeong.mineme.feature.story.R as FeatureStoryR
import com.najudoryeong.mineme.feature.settings.R as FeatureSettingsR
Expand All @@ -37,6 +49,7 @@ class NavigationTest {
val composeTestRule = createAndroidComposeRule<MainActivity>()



private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int) =
ReadOnlyProperty<Any?, String> { _, _ -> activity.getString(resId) }

Expand All @@ -47,10 +60,14 @@ class NavigationTest {
private val settings by composeTestRule.stringResource(FeatureSettingsR.string.settings)




@Before
fun setup() = hiltRule.inject()
fun setup() {
hiltRule.inject()
composeTestRule.apply {
val kakaoSignupText = composeTestRule.activity.getString(R.string.kakao_signup)
onNodeWithText(kakaoSignupText).performClick()
}
}

@Test
fun firstScreen_isHome() {
Expand All @@ -60,9 +77,6 @@ class NavigationTest {
}


//todo restore the state previously visited destinations Test


@Test
fun topLevelDestinations_doNotShowUpArrow() {
composeTestRule.apply {
Expand Down
Loading

0 comments on commit ad889a4

Please sign in to comment.