Skip to content

[MBL-18703][Student][Teacher][Parent] Implement E2E tests for Calendar event/todo reminders #3385

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[MBL-18703][Student][Teacher][Parent] Implement E2E tests for Calendar event/todo reminders #3385

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
4bc805d
Implement E2E tests for Calendar event and To Do reminders.
adam1014-ai Nov 12, 2025
510a7d9
Merge branch 'master' into MBL-18703-Implement-E2E-test-for-Calendar-…
adam1014-ai Nov 12, 2025
d88bcc8
PR findings fix
adam1014-ai Nov 17, 2025
c0a7e74
Merge branch 'master' into MBL-18703-Implement-E2E-test-for-Calendar-…
adam1014-ai Nov 17, 2025
a041c3b
PR fix
adam1014-ai Nov 17, 2025
5d0b621
Merge branch 'master' into MBL-18703-Implement-E2E-test-for-Calendar-…
adam1014-ai Nov 17, 2025
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
510 changes: 507 additions & 3 deletions apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/compose/CalendarE2ETest.kt
View file
Open in desktop

Large diffs are not rendered by default.

522 changes: 519 additions & 3 deletions apps/student/src/androidTest/java/com/instructure/student/ui/e2e/compose/CalendarE2ETest.kt
View file
Open in desktop

Large diffs are not rendered by default.

522 changes: 519 additions & 3 deletions apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/compose/CalendarE2ETest.kt
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/TestMetaData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ enum class SecondaryFeatureCategory {
GROUPS_DASHBOARD, GROUPS_FILES, GROUPS_ANNOUNCEMENTS, GROUPS_DISCUSSIONS, GROUPS_PAGES, GROUPS_PEOPLE,
EVENTS_DISCUSSIONS, EVENTS_QUIZZES, EVENTS_ASSIGNMENTS, EVENTS_NOTIFICATIONS, SETTINGS_EMAIL_NOTIFICATIONS,
MODULES_ASSIGNMENTS, MODULES_DISCUSSIONS, MODULES_FILES, MODULES_PAGES, MODULES_QUIZZES, OFFLINE_MODE, ALL_COURSES, CHANGE_USER, ASSIGNMENT_REMINDER, ASSIGNMENT_DETAILS, SMART_SEARCH, ADD_STUDENT,
SYLLABUS, SUMMARY, FRONT_PAGE, CANVAS_NETWORK, INBOX_SIGNATURE, ACCESS_TOKEN_EXPIRATION, SECTIONS, HELP_MENU, DISCUSSION_CHECKPOINTS
SYLLABUS, SUMMARY, FRONT_PAGE, CANVAS_NETWORK, INBOX_SIGNATURE, ACCESS_TOKEN_EXPIRATION, SECTIONS, HELP_MENU, DISCUSSION_CHECKPOINTS,
CALENDAR_EVENT_REMINDER, CALENDAR_TODO_REMINDER
}

enum class TestCategory {
Expand Down
65 changes: 65 additions & 0 deletions ...n/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarEventDetailsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.instructure.canvas.espresso.common.pages.compose

import android.widget.DatePicker
import android.widget.TimePicker
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsNotDisplayed
import androidx.compose.ui.test.assertTextContains
Expand All @@ -23,21 +25,35 @@ import androidx.compose.ui.test.hasContentDescription
import androidx.compose.ui.test.hasParent
import androidx.compose.ui.test.hasTestTag
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.isDisplayed
import androidx.compose.ui.test.junit4.ComposeTestRule
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.espresso.Espresso.onData
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
import androidx.test.espresso.contrib.PickerActions
import androidx.test.espresso.matcher.RootMatchers.isDialog
import androidx.test.espresso.matcher.ViewMatchers.withClassName
import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.espresso.web.assertion.WebViewAssertions.webMatches
import androidx.test.espresso.web.sugar.Web.onWebView
import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
import androidx.test.espresso.web.webdriver.DriverAtoms.getText
import androidx.test.espresso.web.webdriver.Locator
import com.instructure.espresso.click
import com.instructure.espresso.matchers.WaitForViewMatcher.waitForView
import com.instructure.espresso.page.BasePage
import com.instructure.espresso.page.plus
import com.instructure.espresso.page.withAncestor
import com.instructure.espresso.page.withId
import com.instructure.espresso.scrollTo
import com.instructure.pandautils.R
import org.hamcrest.Matchers
import org.hamcrest.Matchers.anything
import java.util.Calendar

class CalendarEventDetailsPage(private val composeTestRule: ComposeTestRule) : BasePage() {

Expand Down Expand Up @@ -124,4 +140,53 @@ class CalendarEventDetailsPage(private val composeTestRule: ComposeTestRule) : B
fun clickComposeMessageFAB() {
composeTestRule.onNodeWithContentDescription("Send a message about this event").performClick()
}

fun assertReminderSectionDisplayed() {
composeTestRule.onNodeWithText(R.string.reminderTitle.toString()).isDisplayed()
composeTestRule.onNodeWithText(R.string.reminderDescription.toString()).isDisplayed()
composeTestRule.onNodeWithContentDescription(R.string.a11y_addReminder.toString()).isDisplayed()
}

fun clickBeforeReminderOption(reminderText: String) {
waitForView(withText(reminderText)).scrollTo().click()
composeTestRule.waitForIdle()
}

fun clickCustomReminderOption() {
onData(anything()).inRoot(isDialog()).atPosition(6).perform(click())
}

fun clickAddReminder() {
composeTestRule.onNodeWithContentDescription("Add reminder").performClick()
}

fun assertReminderDisplayedWithText(reminderText: String) {
composeTestRule.onNodeWithText(reminderText).isDisplayed()
}

fun removeReminder() {
composeTestRule.onNode(
hasContentDescription("Remove")
).performClick()
Thread.sleep(1000)
waitForView(withText(R.string.yes)).scrollTo().click()
}

fun assertReminderNotDisplayedWithText(reminderText: String) {
onView(withText(reminderText)).check(doesNotExist())
}

fun selectDate(calendar: Calendar) {
onView(withClassName(Matchers.equalTo(DatePicker::class.java.name)))
.perform(PickerActions.setDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DAY_OF_MONTH)))

onView(withId(android.R.id.button1)).perform(click())
}

fun selectTime(calendar: Calendar) {
onView(withClassName(Matchers.equalTo(TimePicker::class.java.name)))
.perform(PickerActions.setTime(calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE)))

onView(withId(android.R.id.button1)).perform(click())
}
}
20 changes: 12 additions & 8 deletions ...rc/main/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarScreenPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,22 @@ class CalendarScreenPage(private val composeTestRule: ComposeTestRule) : BasePag
composeTestRule.waitForIdle()
}

fun swipeEventsLeft() {
composeTestRule.onNodeWithTag("calendarEventsPage0").performTouchInput {
swipeLeft()
fun swipeEventsLeft(times: Int = 1) {
repeat(times) {
composeTestRule.onNodeWithTag("calendarEventsPage0").performTouchInput {
swipeLeft()
}
composeTestRule.waitForIdle()
}
composeTestRule.waitForIdle()
}

fun swipeEventsRight() {
composeTestRule.onNodeWithTag("calendarEventsPage0").performTouchInput {
swipeRight()
fun swipeEventsRight(times: Int = 1) {
repeat(times) {
composeTestRule.onNodeWithTag("calendarEventsPage0").performTouchInput {
swipeRight()
}
composeTestRule.waitForIdle()
}
composeTestRule.waitForIdle()
}

fun clickCalendarHeader() {
Expand Down
68 changes: 68 additions & 0 deletions ...in/kotlin/com/instructure/canvas/espresso/common/pages/compose/CalendarToDoDetailsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
package com.instructure.canvas.espresso.common.pages.compose

import android.content.Context
import android.widget.DatePicker
import android.widget.TimePicker
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertTextEquals
import androidx.compose.ui.test.hasContentDescription
Expand All @@ -24,10 +26,27 @@ import androidx.compose.ui.test.hasTestTag
import androidx.compose.ui.test.hasText
import androidx.compose.ui.test.isDisplayed
import androidx.compose.ui.test.junit4.ComposeTestRule
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.espresso.Espresso.onData
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
import androidx.test.espresso.contrib.PickerActions
import androidx.test.espresso.matcher.RootMatchers.isDialog
import androidx.test.espresso.matcher.ViewMatchers.withClassName
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.espresso.matcher.ViewMatchers.withText
import com.instructure.canvasapi2.utils.DateHelper
import com.instructure.espresso.click
import com.instructure.espresso.matchers.WaitForViewMatcher.waitForView
import com.instructure.espresso.scrollTo
import com.instructure.pandautils.R
import org.hamcrest.Matchers
import org.hamcrest.Matchers.anything
import java.util.Calendar
import java.util.Date

class CalendarToDoDetailsPage(private val composeTestRule: ComposeTestRule) {
Expand Down Expand Up @@ -92,4 +111,53 @@ class CalendarToDoDetailsPage(private val composeTestRule: ComposeTestRule) {
composeTestRule.onNodeWithText("Delete To Do?").assertIsDisplayed()
composeTestRule.onNodeWithText("Delete").performClick()
}

fun assertReminderSectionDisplayed() {
composeTestRule.onNodeWithText(R.string.reminderTitle.toString()).isDisplayed()
composeTestRule.onNodeWithText(R.string.reminderDescription.toString()).isDisplayed()
composeTestRule.onNodeWithContentDescription(R.string.a11y_addReminder.toString()).isDisplayed()
}

fun clickBeforeReminderOption(reminderText: String) {
waitForView(withText(reminderText)).scrollTo().click()
composeTestRule.waitForIdle()
}

fun clickCustomReminderOption() {
onData(anything()).inRoot(isDialog()).atPosition(6).perform(click())
}

fun clickAddReminder() {
composeTestRule.onNodeWithContentDescription("Add reminder").performClick()
}

fun assertReminderDisplayedWithText(reminderText: String) {
composeTestRule.onNodeWithText(reminderText).isDisplayed()
}

fun removeReminder() {
composeTestRule.onNode(
hasContentDescription("Remove")
).performClick()
Thread.sleep(1000)
waitForView(withText(com.instructure.pandautils.R.string.yes)).scrollTo().click()
}

fun assertReminderNotDisplayedWithText(reminderText: String) {
onView(withText(reminderText)).check(doesNotExist())
}

fun selectDate(calendar: Calendar) {
onView(withClassName(Matchers.equalTo(DatePicker::class.java.name)))
.perform(PickerActions.setDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH) + 1, calendar.get(Calendar.DAY_OF_MONTH)))

onView(withId(android.R.id.button1)).perform(click())
}

fun selectTime(calendar: Calendar) {
onView(withClassName(Matchers.equalTo(TimePicker::class.java.name)))
.perform(PickerActions.setTime(calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE)))

onView(withId(android.R.id.button1)).perform(click())
}
}
Loading