Merge pull request #3096 from instructure/release/student-7.14.0-278

Release Student 7.14.0 (278)

Author: hermannakos

apps/buildSrc/src/main/java/GlobalDependencies.kt

@@ -3,7 +3,7 @@
 object Versions {
     /* SDK Versions */
     const val COMPILE_SDK = 35
-    const val MIN_SDK = 26
+    const val MIN_SDK = 28
     const val TARGET_SDK = 35
 
     /* Build/tooling */

apps/parent/build.gradle

@@ -40,8 +40,8 @@ android {
         applicationId "com.instructure.parentapp"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode 58
-        versionName "4.2.0"
+        versionCode 59
+        versionName "4.3.0"
 
         buildConfigField "boolean", "IS_TESTING", "false"
         testInstrumentationRunner 'com.instructure.parentapp.ui.espresso.ParentHiltTestRunner'

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/AlertsE2ETest.kt

@@ -71,9 +71,7 @@ class AlertsE2ETest : ParentComposeTest() {
         studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_MISSING)
         studentAlertSettingsPage.clickThreshold(AlertType.COURSE_ANNOUNCEMENT)
         studentAlertSettingsPage.clickThreshold(AlertType.INSTITUTION_ANNOUNCEMENT)
-        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_HIGH)
-        studentAlertSettingsPage.enterThreshold("80")
-        studentAlertSettingsPage.tapThresholdSaveButton()
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "80")
 
         Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
         ViewUtils.pressBackButton(2)
@@ -119,10 +117,7 @@ class AlertsE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Change some alert settings")
         studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_HIGH)
         studentAlertSettingsPage.tapThresholdNeverButton()
-        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_LOW)
-        studentAlertSettingsPage.enterThreshold("20")
-        studentAlertSettingsPage.tapThresholdSaveButton()
-
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "20")
 
         Log.d(PREPARATION_TAG, "Seeding assignment for '${course.name}' course.")
         val testAssignmentBelow = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 20.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(
@@ -182,9 +177,7 @@ class AlertsE2ETest : ParentComposeTest() {
 
         Log.d(STEP_TAG, "Open the Student Alert Settings Page and enable alerts")
         manageStudentsPage.clickStudent(student.shortName)
-        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_HIGH)
-        studentAlertSettingsPage.enterThreshold("80")
-        studentAlertSettingsPage.tapThresholdSaveButton()
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "80")
 
         Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
         ViewUtils.pressBackButton(2)
@@ -260,21 +253,10 @@ class AlertsE2ETest : ParentComposeTest() {
         studentAlertSettingsPage.clickThreshold(AlertType.COURSE_ANNOUNCEMENT)
         studentAlertSettingsPage.clickThreshold(AlertType.INSTITUTION_ANNOUNCEMENT)
 
-        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_HIGH)
-        studentAlertSettingsPage.enterThreshold("80")
-        studentAlertSettingsPage.tapThresholdSaveButton()
-
-        studentAlertSettingsPage.clickThreshold(AlertType.ASSIGNMENT_GRADE_LOW)
-        studentAlertSettingsPage.enterThreshold("20")
-        studentAlertSettingsPage.tapThresholdSaveButton()
-
-        studentAlertSettingsPage.clickThreshold(AlertType.COURSE_GRADE_HIGH)
-        studentAlertSettingsPage.enterThreshold("80")
-        studentAlertSettingsPage.tapThresholdSaveButton()
-
-        studentAlertSettingsPage.clickThreshold(AlertType.COURSE_GRADE_LOW)
-        studentAlertSettingsPage.enterThreshold("20")
-        studentAlertSettingsPage.tapThresholdSaveButton()
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "80")
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "20")
+        studentAlertSettingsPage.setThreshold(AlertType.COURSE_GRADE_HIGH, "80")
+        studentAlertSettingsPage.setThreshold(AlertType.COURSE_GRADE_LOW, "20")
 
         Log.d(STEP_TAG, "Reopen the alerts screen")
         Espresso.pressBack()
@@ -354,4 +336,110 @@ class AlertsE2ETest : ParentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the alerts are empty.")
         alertsPage.assertEmptyState()
     }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.ALERTS, TestCategory.E2E)
+    fun testAlertsUndoMechanismE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, courses = 1, teachers = 1, parents = 1)
+        val course = data.coursesList[0]
+        val parent = data.parentsList[0]
+        val student = data.studentsList[0]
+        val teacher = data.teachersList[0]
+
+        Log.d(STEP_TAG, "Login with user: '${parent.name}', login id: '${parent.loginId}'.")
+        tokenLogin(parent)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open the Left Side Navigation Drawer menu.")
+        dashboardPage.openLeftSideMenu()
+
+        Log.d(STEP_TAG, "Open the Manage Students Page.")
+        leftSideNavigationDrawerPage.clickManageStudents()
+
+        Log.d(STEP_TAG, "Open the Student Alert Settings Page and enable some alerts.")
+        manageStudentsPage.clickStudent(student.shortName)
+
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "80")
+        studentAlertSettingsPage.setThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "20")
+        studentAlertSettingsPage.setThreshold(AlertType.COURSE_GRADE_HIGH, "80")
+
+        Log.d(STEP_TAG, "Reopen the alerts screen and refresh it.")
+        Espresso.pressBack()
+        manageStudentsPage.clickStudent(student.shortName)
+        alertsPage.refresh()
+
+        Log.d(ASSERTION_TAG, "Assert that the alert settings are saved")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.ASSIGNMENT_GRADE_HIGH, "80%")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.ASSIGNMENT_GRADE_LOW, "20%")
+        studentAlertSettingsPage.assertPercentageThreshold(AlertType.COURSE_GRADE_HIGH, "80%")
+
+        Log.d(STEP_TAG, "Navigate back to Dashboard Page.")
+        ViewUtils.pressBackButton(2)
+
+        Log.d(STEP_TAG, "Open the Alerts Page.")
+        dashboardPage.clickAlertsBottomMenu()
+
+        Log.d(PREPARATION_TAG, "Seeding assignment for '${course.name}' course.")
+        val testAssignment = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 20.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(
+            SubmissionType.ONLINE_TEXT_ENTRY), assignmentName = "Test Assignment")
+
+        Log.d(PREPARATION_TAG, "Submit assignment: '${testAssignment.name}' for student: '${student.name}'.")
+        SubmissionsApi.seedAssignmentSubmission(course.id, student.token, testAssignment.id, submissionSeedsList = listOf(
+            SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY)))
+
+        Log.d(PREPARATION_TAG, "Grade submission: '${testAssignment.name}' with 18 points.")
+        SubmissionsApi.gradeSubmission(teacher.token, course.id, testAssignment.id, student.id, postedGrade = "18")
+
+        Log.d(PREPARATION_TAG, "Seeding another assignment for '${course.name}' course.")
+        val testAssignmentBelow = AssignmentsApi.createAssignment(course.id, teacher.token, gradingType = GradingType.POINTS, pointsPossible = 20.0, dueAt = 1.days.fromNow.iso8601, submissionTypes = listOf(
+            SubmissionType.ONLINE_TEXT_ENTRY), assignmentName = "Test Assignment Below")
+
+        Log.d(PREPARATION_TAG, "Submit assignment: '${testAssignmentBelow.name}' for student: '${student.name}'.")
+        SubmissionsApi.seedAssignmentSubmission(course.id, student.token, testAssignmentBelow.id, submissionSeedsList = listOf(
+            SubmissionsApi.SubmissionSeedInfo(amount = 1, submissionType = SubmissionType.ONLINE_TEXT_ENTRY)))
+
+        Log.d(PREPARATION_TAG, "Grade submission: '${testAssignmentBelow.name}' with 1 points.")
+        SubmissionsApi.gradeSubmission(teacher.token, course.id, testAssignmentBelow.id, student.id, postedGrade = "1")
+
+        Thread.sleep(5000) // Allow the grading to propagate
+        val gradeBelowAlertTitle = "Assignment Grade Below 20"
+        val gradeFilterLabel = "Course Grade Above 80"
+
+        Log.d(STEP_TAG, "Refresh the Alerts Page")
+        alertsPage.refresh()
+
+        Log.d(ASSERTION_TAG, "Assert that the alerts are displayed.")
+        alertsPage.assertAlertItemDisplayed(gradeBelowAlertTitle)
+        alertsPage.assertAlertItemDisplayed("Assignment graded: 1 on Test Assignment Below in ${course.courseCode}")
+        alertsPage.assertAlertItemDisplayed(gradeFilterLabel)
+        alertsPage.assertAlertItemDisplayed("Course grade: 90.0% in ${course.courseCode}")
+        alertsPage.assertAlertItemDisplayed("Assignment Grade Above 80")
+        alertsPage.assertAlertItemDisplayed("Assignment graded: 18 on Test Assignment in ${course.courseCode}")
+
+        Log.d(STEP_TAG, "Dismiss the '$gradeBelowAlertTitle' alert.")
+        alertsPage.dismissAlert("Assignment graded: 1 on Test Assignment Below in ${course.courseCode}")
+
+        Log.d(STEP_TAG, "Click on the UNDO button in the snackbar.")
+        alertsPage.clickUndo()
+
+        Log.d(ASSERTION_TAG, "Assert that the '$gradeBelowAlertTitle' alert is displayed again and it is no longer marked as unread.")
+        alertsPage.assertAlertItemDisplayed(gradeBelowAlertTitle)
+        alertsPage.assertAlertItemDisplayed("Assignment graded: 1 on Test Assignment Below in ${course.courseCode}")
+        alertsPage.assertAlertRead("Assignment graded: 1 on Test Assignment Below in ${course.courseCode}")
+
+        Log.d(STEP_TAG, "Dismiss the '$gradeFilterLabel' alert.")
+        alertsPage.dismissAlert("Course grade: 90.0% in ${course.courseCode}")
+
+        Log.d(STEP_TAG, "Click on the UNDO button in the snackbar.")
+        alertsPage.clickUndo()
+
+        Log.d(ASSERTION_TAG, "Assert that the '$gradeFilterLabel' alert is displayed again and it is no longer marked as unread same as the '$gradeBelowAlertTitle' alert.")
+        alertsPage.assertAlertItemDisplayed(gradeFilterLabel)
+        alertsPage.assertAlertItemDisplayed("Course grade: 90.0% in ${course.courseCode}")
+        alertsPage.assertAlertRead("Course grade: 90.0% in ${course.courseCode}")
+    }
+
 }

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/HelpMenuE2ETest.kt

@@ -21,8 +21,11 @@ import androidx.test.espresso.intent.Intents
 import com.instructure.canvas.espresso.E2E
 import com.instructure.canvas.espresso.FeatureCategory
 import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.Stub
 import com.instructure.canvas.espresso.TestCategory
 import com.instructure.canvas.espresso.TestMetaData
+import com.instructure.canvas.espresso.checkToastText
+import com.instructure.parentapp.R
 import com.instructure.parentapp.utils.ParentComposeTest
 import com.instructure.parentapp.utils.seedData
 import com.instructure.parentapp.utils.tokenLogin
@@ -39,6 +42,7 @@ class HelpMenuE2ETest : ParentComposeTest() {
     @E2E
     @Test
     @TestMetaData(Priority.NICE_TO_HAVE, FeatureCategory.DASHBOARD, TestCategory.E2E)
+    @Stub
     fun testHelpMenuE2E() {
 
         Log.d(PREPARATION_TAG, "Seeding data.")
@@ -67,6 +71,9 @@ class HelpMenuE2ETest : ParentComposeTest() {
         Log.d(ASSERTION_TAG, "Assert that the 'Report a Problem' dialog has displayed.")
         helpPage.assertReportProblemDialogDisplayed()
 
+        Log.d(STEP_TAG, "Click on 'Cancel' button on the 'Report a problem' dialog.")
+        helpPage.clickCancelReportProblem()
+
         Log.d(ASSERTION_TAG, "Assert that when clicking on the different help menu items then the corresponding intents will be fired and has the proper URLs.")
         Intents.init()
 
@@ -79,4 +86,46 @@ class HelpMenuE2ETest : ParentComposeTest() {
             Intents.release()
         }
     }
+
+    @E2E
+    @Test
+    @TestMetaData(Priority.COMMON, FeatureCategory.DASHBOARD, TestCategory.E2E)
+    @Stub
+    fun testHelpMenuReportProblemE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(parents = 1, students = 1, courses = 1)
+        val parent = data.parentsList[0]
+
+        Log.d(STEP_TAG, "Login with user: '${parent.name}', login id: '${parent.loginId}'.")
+        tokenLogin(parent)
+        dashboardPage.waitForRender()
+
+        Log.d(STEP_TAG, "Open the Left Side Navigation Drawer menu.")
+        dashboardPage.openLeftSideMenu()
+
+        Log.d(STEP_TAG, "Open Help Menu.")
+        leftSideNavigationDrawerPage.clickHelpMenu()
+
+        Log.d(ASSERTION_TAG, "Assert Help Menu Dialog is displayed.")
+        helpPage.assertHelpMenuDisplayed()
+
+        Log.d(ASSERTION_TAG, "Assert that all the corresponding Help menu content are displayed.")
+        helpPage.assertHelpMenuContent()
+
+        Log.d(STEP_TAG, "Click on the 'Report a Problem' help menu.")
+        helpPage.clickReportProblemLabel()
+
+        Log.d(ASSERTION_TAG, "Assert that it is possible to write into the input fields and the corresponding buttons are displayed as well.")
+        helpPage.assertReportProblemDialogDisplayed()
+
+        Log.d(STEP_TAG, "Fill in the 'Report a problem' form with subject and description.")
+        helpPage.fillReportProblemForm("Test Subject", "Test Description")
+
+        Log.d(STEP_TAG, "Click on the 'Send' button on the 'Report a problem' dialog.")
+        helpPage.clickSendReportProblem()
+
+        Log.d(ASSERTION_TAG, "Assert that the corresponding toast message is displayed.")
+        checkToastText(R.string.errorReportThankyou, activityRule.activity)
+    }
 }

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/LoginE2ETest.kt

@@ -64,7 +64,7 @@ class LoginE2ETest : ParentComposeTest() {
         Log.d(STEP_TAG, "Open the Left Side Navigation Drawer menu (to be able to log out).")
         dashboardPage.openLeftSideMenu()
 
-        Log.d(STEP_TAG, "Log out with '${student.name}' student.")
+        Log.d(STEP_TAG, "Log out with '${parent.name}' student.")
         leftSideNavigationDrawerPage.logout()
 
         Log.d(STEP_TAG, "Login with user: '${student.name}', login id: '${student.loginId}'.")
@@ -310,4 +310,89 @@ class LoginE2ETest : ParentComposeTest() {
         loginSignInPage.loginAs(user)
     }
 
+    @E2E
+    @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.LOGIN, TestCategory.E2E)
+    fun testLoginWithParentWhoHasNoStudentE2E() {
+
+        Log.d(PREPARATION_TAG, "Seeding data.")
+        val data = seedData(students = 1, courses = 1, parents = 1)
+        val parent = data.parentsList[0]
+        val parentWithoutStudent = UserApi.createCanvasUser()
+        val student = data.studentsList[0]
+
+        Log.d(STEP_TAG, "Login with user: '${parentWithoutStudent.name}', login id: '${parentWithoutStudent.loginId}'.")
+        loginWithUser(parentWithoutStudent)
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Not a Parent' page has been displayed with all the corresponding information on it.")
+        notAParentPage.assertNotAParentPageDetails()
+
+        Log.d(STEP_TAG, "Click on 'Return to login' button to navigate back to the login page.")
+        notAParentPage.clickReturnToLogin()
+
+        Log.d(STEP_TAG, "Login with user: '${parent.name}', login id: '${parent.loginId}'.")
+        loginWithUser(parent, true)
+
+        Log.d(PREPARATION_TAG, "Generate a pairing code for the '${student.name}' student to be able to pair with an observer.")
+        val responsePairingCodeObject = UserApi.postGeneratePairingCode(student.id)
+
+        Log.d(ASSERTION_TAG, "Assert that the Dashboard Page is the landing page and it is loaded successfully.")
+        dashboardPage.waitForRender()
+        dashboardPage.assertPageObjects()
+
+        Log.d(ASSERTION_TAG, "Assert that the '${parent.name}' parent user has logged in.")
+        leftSideNavigationDrawerPage.assertUserLoggedIn(parent)
+
+        Log.d(STEP_TAG, "Open the Left Side Navigation Drawer menu.")
+        dashboardPage.openLeftSideMenu()
+
+        Log.d(STEP_TAG, "Click on the 'Manage Students' button on the left-side menu.")
+        leftSideNavigationDrawerPage.clickManageStudents()
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Manage Students' page is displayed with the '${student.name}' student.")
+        manageStudentsPage.assertToolbarTitle()
+        manageStudentsPage.assertStudentItemDisplayed(student.shortName)
+
+        Log.d(STEP_TAG, "Click on the 'Add Student' FAB (+) button on the bottom-right corner.")
+        manageStudentsPage.tapAddStudent()
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Add student with...' label and both the 'Pairing Code' and the 'QR Code' options are displayed on the Add Student (bottom) Page.")
+        addStudentBottomPage.assertAddStudentWithLabel()
+        addStudentBottomPage.assertPairingCodeOptionDisplayed()
+        addStudentBottomPage.assertQRCodeOptionDisplayed()
+
+        Log.d(STEP_TAG, "Click on the 'Pairing Code' to add a student via pairing code.")
+        addStudentBottomPage.clickOnPairingCode()
+
+        Log.d(STEP_TAG, "Enter the pairing code of the student and click on the 'OK' button to apply.")
+        pairingCodePage.enterPairingCode(responsePairingCodeObject.pairingCode.toString())
+        pairingCodePage.clickOkButton()
+        composeTestRule.waitForIdle()
+
+        Log.d(ASSERTION_TAG, "Assert that the '${student.shortName}' student is displayed.")
+        manageStudentsPage.assertStudentItemDisplayed(student.shortName)
+
+        Log.d(STEP_TAG, "Click on the '${student.name}' student on the 'Manage Students' page.")
+        manageStudentsPage.clickStudent(student.shortName)
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Alert Settings' page is displayed.")
+        studentAlertSettingsPage.assertToolbarTitle()
+
+        Log.d(STEP_TAG, "Click on the 'overflow menu' button on the 'Alert Settings' page.")
+        studentAlertSettingsPage.clickOverflowMenu()
+
+        Log.d(STEP_TAG, "Click on the 'Delete Student' button on the overflow menu.")
+        studentAlertSettingsPage.clickDeleteStudent()
+
+        Log.d(ASSERTION_TAG, "Assert that the 'Delete Student' dialog is displayed with the correct details.")
+        studentAlertSettingsPage.assertDeleteStudentDialogDetails()
+
+        Log.d(STEP_TAG, "Click on the 'Delete' button on the 'Delete Student' dialog.")
+        studentAlertSettingsPage.clickDeleteStudentButton()
+
+        Log.d(ASSERTION_TAG, "Assert that the previously deleted student is not displayed on the 'Manage Students' page anymore.")
+        manageStudentsPage.assertStudentItemNotDisplayed(student.shortName)
+        manageStudentsPage.assertEmptyContent()
+    }
+
 }