Skip to content

refactor(NotificationSettingsWidget): Adopt new VM #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
KaylaBrady wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

refactor(NotificationSettingsWidget): Adopt new VM #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8899d0
feat(NotificationSettingsViewModel): New VM to hold notification sett…
KaylaBrady Sep 3, 2026
da99678
refactor(NotificationSettingsWidget): Adopt new VM
KaylaBrady Sep 3, 2026
e640e83
style(NotificationWindowPresets): Run pre-commit again after rebase
KaylaBrady Sep 9, 2026
f0f99fc
fix(NotificationSwitch): react immediately if permissions denied
KaylaBrady Sep 9, 2026
c258839
fix: test issues, PR feedback
KaylaBrady Sep 9, 2026
46a4a50
fix: one more vm in preview
KaylaBrady Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 102 additions & 60 deletions ...ndroidTest/java/com/mbta/tid/mbta_app/android/favorites/NotificationSettingsWidgetTest.kt
View file
Open in desktop

Large diffs are not rendered by default.

164 changes: 17 additions & 147 deletions .../src/androidTest/java/com/mbta/tid/mbta_app/android/favorites/PresetWindowSelectorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@ import androidx.compose.ui.test.assertIsSelected
import androidx.compose.ui.test.junit4.v2.createComposeRule
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import com.mbta.tid.mbta_app.model.FavoriteSettings.Notifications.Window
import com.mbta.tid.mbta_app.model.PresetSelection
import com.mbta.tid.mbta_app.model.PresetWindow
import com.mbta.tid.mbta_app.utils.EasternTimeInstant
import com.mbta.tid.mbta_app.model.Preset
import kotlin.test.assertEquals
import kotlinx.datetime.DayOfWeek
import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.LocalTime
import org.junit.Rule
import org.junit.Test

Expand All @@ -22,171 +16,47 @@ class PresetWindowSelectorTest {

@Test
fun testPresetWindowsVisible() {
var selectedWindows: List<Window>? = null
var selectedPreset: Preset? = null
composeTestRule.setContent {
PresetWindowSelector(
presetRows =
listOf(
listOf(
PresetWindow(
window = Window.morningDefault(Window.weekdays),
label = "Morning",
)
),
listOf(
PresetWindow(
window = Window.middayDefault(Window.weekdays),
label = "Midday",
)
),
listOf(Preset.Morning),
listOf(Preset.Midday),
),
selectedPreset = PresetSelection.Preset(rowIndex = 1, columnIndex = 0),
now = EasternTimeInstant(LocalDateTime(2026, 8, 27, 4, 30, 0)),
) { windows ->
selectedWindows = windows
}
selectedPreset = Preset.Midday,
onSelect = { preset -> selectedPreset = preset },
)
}

composeTestRule.onNodeWithText("Morning").assertIsNotSelected()
composeTestRule.onNodeWithText("Midday").assertIsSelected()
composeTestRule.onNodeWithText("Custom").assertIsNotSelected()

composeTestRule.onNodeWithText("Morning").performClick()
assertEquals(listOf(Window.morningDefault(Window.weekdays)), selectedWindows)
}

@Test
fun testCustomDefaultsToNow() {
var selectedWindows: List<Window>? = null
composeTestRule.setContent {
PresetWindowSelector(
presetRows =
listOf(
listOf(
PresetWindow(
window = Window.morningDefault(Window.weekdays),
label = "Morning",
)
),
listOf(
PresetWindow(
window = Window.middayDefault(Window.weekdays),
label = "Midday",
)
),
),
selectedPreset = PresetSelection.Preset(rowIndex = 1, columnIndex = 0),
now = EasternTimeInstant(LocalDateTime(2026, 8, 27, 4, 30, 0)),
) { windows ->
selectedWindows = windows
}
}

composeTestRule.onNodeWithText("Custom").performClick()
assertEquals(
selectedWindows,
listOf(
Window(
startTime = LocalTime(4, 0, 0),
endTime = LocalTime(5, 0, 0),
daysOfWeek =
setOf(
DayOfWeek.MONDAY,
DayOfWeek.TUESDAY,
DayOfWeek.WEDNESDAY,
DayOfWeek.THURSDAY,
DayOfWeek.FRIDAY,
),
)
),
)
assertEquals(Preset.Morning, selectedPreset)
}

@Test
fun testCustomDefaultsToNowLateNight() {
var selectedWindows: List<Window>? = null
fun testCustomSetsNullPreset() {
var selectedPreset: Preset? = Preset.Midday
composeTestRule.setContent {
PresetWindowSelector(
presetRows =
listOf(
listOf(
PresetWindow(
window = Window.morningDefault(Window.weekdays),
label = "Morning",
)
),
listOf(
PresetWindow(
window = Window.middayDefault(Window.weekdays),
label = "Midday",
)
),
listOf(Preset.Morning),
listOf(Preset.Midday),
),
selectedPreset = PresetSelection.Preset(rowIndex = 1, columnIndex = 0),
now = EasternTimeInstant(LocalDateTime(2026, 8, 27, 23, 30, 0)),
) { windows ->
selectedWindows = windows
}
selectedPreset = Preset.Midday,
onSelect = { preset -> selectedPreset = preset },
)
}

composeTestRule.onNodeWithText("Custom").performClick()
assertEquals(
selectedWindows,
listOf(
Window(
startTime = LocalTime(23, 0, 0),
endTime = LocalTime(23, 59, 0),
daysOfWeek =
setOf(
DayOfWeek.MONDAY,
DayOfWeek.TUESDAY,
DayOfWeek.WEDNESDAY,
DayOfWeek.THURSDAY,
DayOfWeek.FRIDAY,
),
)
),
null,
selectedPreset,
)
}

@Test
fun testCustomUsesProvidedCustomPreset() {
var selectedWindows: List<Window>? = null
val customPresetWindows =
listOf(
Window(
startTime = LocalTime(10, 15, 0),
endTime = LocalTime(11, 45, 0),
daysOfWeek = setOf(DayOfWeek.SUNDAY, DayOfWeek.TUESDAY),
)
)

composeTestRule.setContent {
PresetWindowSelector(
presetRows =
listOf(
listOf(
PresetWindow(
window = Window.morningDefault(Window.weekdays),
label = "Morning",
)
),
listOf(
PresetWindow(
window = Window.middayDefault(Window.weekdays),
label = "Midday",
)
),
),
selectedPreset = PresetSelection.Preset(rowIndex = 1, columnIndex = 0),
now = EasternTimeInstant(LocalDateTime(2026, 8, 27, 4, 30, 0)),
customPreset = customPresetWindows,
) { windows ->
selectedWindows = windows
}
}

composeTestRule.onNodeWithText("Custom").performClick()
assertEquals(customPresetWindows, selectedWindows)
}
}
2 changes: 1 addition & 1 deletion androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/pages/SaveFavoritePageTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class SaveFavoritePageTests {
}

@Test
fun testEditExisting() {
fun testEditExistingNotifications() {
val objects = TestData.clone()
val route = objects.getRoute("Orange")
val stop = objects.getStop("place-welln")
Expand Down
Loading
Loading