Release Teacher 1.25.0 (59)

instructure · Jul 10, 2023 · 7204f8c · 7204f8c
2 parents a0344ac + 262d376
commit 7204f8c
Show file tree

Hide file tree

Showing 173 changed files with 3,935 additions and 519 deletions.
diff --git a/PULL_REQUEST_TEMPLATE b/PULL_REQUEST_TEMPLATE
@@ -19,8 +19,8 @@ release note:
 ## Checklist
 
 - [ ] Follow-up e2e test ticket created or not needed
-- [ ] Run E2E test suite or not needed
+- [ ] Run E2E test suite
 - [ ] Tested in dark mode
 - [ ] Tested in light mode
 - [ ] A11y checked
-- [ ] Approve from product or not needed
+- [ ] Approve from product
diff --git a/apps/student/build.gradle b/apps/student/build.gradle
@@ -50,8 +50,8 @@ android {
         applicationId "com.instructure.candroid"
         minSdkVersion Versions.MIN_SDK
         targetSdkVersion Versions.TARGET_SDK
-        versionCode = 250
-        versionName = '6.23.1'
+        versionCode = 251
+        versionName = '6.24.0'
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
@@ -349,7 +349,6 @@ dependencies {
     implementation Libs.ROOM
     kapt Libs.ROOM_COMPILER
     implementation Libs.ROOM_COROUTINES
-    testImplementation Libs.ROOM_TEST
 }
 
 // Comment out this line if the reporting logic starts going wonky.

diff --git a/apps/student/flank.yml b/apps/student/flank.yml
@@ -14,8 +14,8 @@ gcloud:
   test-targets:
   - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug
   device:
-  - model: Nexus6P
-    version: 26
+  - model: Pixel2.arm
+    version: 29
     locale: en_US
     orientation: portrait
 

diff --git a/apps/student/flank_e2e.yml b/apps/student/flank_e2e.yml
@@ -15,8 +15,8 @@ gcloud:
   - annotation com.instructure.canvas.espresso.E2E
   - notAnnotation com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug
   device:
-  - model: Nexus6P
-    version: 26
+  - model: Pixel2.arm
+    version: 29
     locale: en_US
     orientation: portrait
 

diff --git a/apps/student/flank_e2e_lowres.yml b/apps/student/flank_e2e_lowres.yml
@@ -16,7 +16,7 @@ gcloud:
   - notAnnotation com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.FlakyE2E, com.instructure.canvas.espresso.KnownBug
   device:
   - model: NexusLowRes
-    version: 26
+    version: 29
     locale: en_US
     orientation: portrait
 

diff --git a/apps/student/flank_landscape.yml b/apps/student/flank_landscape.yml
@@ -14,8 +14,8 @@ gcloud:
   test-targets:
   - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubLandscape
   device:
-  - model: Nexus6P
-    version: 26
+  - model: Pixel2.arm
+    version: 29
     locale: en_US
     orientation: landscape
 

diff --git a/apps/student/flank_multi_api_level.yml b/apps/student/flank_multi_api_level.yml
@@ -23,7 +23,7 @@ gcloud:
     locale: en_US
     orientation: portrait
   - model: NexusLowRes
-    version: 29
+    version: 30
     locale: en_US
     orientation: portrait
 

diff --git a/apps/student/flank_tablet.yml b/apps/student/flank_tablet.yml
@@ -14,12 +14,12 @@ gcloud:
   test-targets:
   - notAnnotation com.instructure.canvas.espresso.E2E, com.instructure.canvas.espresso.Stub, com.instructure.canvas.espresso.StubTablet
   device:
-  - model: Nexus7_clone_16_9
-    version: 26
+  - model: MediumTablet.arm
+    version: 29
     locale: en_US
     orientation: landscape
-  - model: Nexus7_clone_16_9
-    version: 26
+  - model: MediumTablet.arm
+    version: 29
     locale: en_US
     orientation: portrait
 

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/GradesE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/GradesE2ETest.kt
@@ -1,13 +1,20 @@
 package com.instructure.student.ui.e2e
 
 import android.util.Log
+import androidx.test.espresso.Espresso
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.instructure.canvas.espresso.E2E
 import com.instructure.canvas.espresso.containsTextCaseInsensitive
 import com.instructure.dataseeding.api.AssignmentsApi
 import com.instructure.dataseeding.api.QuizzesApi
 import com.instructure.dataseeding.api.SubmissionsApi
-import com.instructure.dataseeding.model.*
+import com.instructure.dataseeding.model.AssignmentApiModel
+import com.instructure.dataseeding.model.CanvasUserApiModel
+import com.instructure.dataseeding.model.CourseApiModel
+import com.instructure.dataseeding.model.GradingType
+import com.instructure.dataseeding.model.QuizAnswer
+import com.instructure.dataseeding.model.QuizQuestion
+import com.instructure.dataseeding.model.SubmissionType
 import com.instructure.dataseeding.util.days
 import com.instructure.dataseeding.util.fromNow
 import com.instructure.dataseeding.util.iso8601
@@ -41,6 +48,7 @@ class GradesE2ETest: StudentTest() {
 
         Log.d(PREPARATION_TAG,"Seeding assignment for ${course.name} course.")
         val assignment = createAssignment(course, teacher)
+        val assignment2 = createAssignment(course, teacher)
 
         Log.d(PREPARATION_TAG,"Create a quiz with some questions.")
         val quizQuestions = makeQuizQuestions()
@@ -76,7 +84,7 @@ class GradesE2ETest: StudentTest() {
         Log.d(STEP_TAG,"Enter '12' as a what-if grade for ${assignment.name} assignment.")
         courseGradesPage.enterWhatIfGrade(assignmentMatcher, "12")
 
-        Log.d(STEP_TAG,"Assert that 'Total Grade' contains the score '80'.")
+        Log.d(STEP_TAG,"Assert that 'Total Grade' contains the score '80%'.")
         courseGradesPage.assertTotalGrade(containsTextCaseInsensitive("80"))
 
         Log.d(STEP_TAG,"Check out the 'What-If Score' checkbox.")
@@ -85,27 +93,69 @@ class GradesE2ETest: StudentTest() {
         Log.d(STEP_TAG,"Assert that after disabling the 'What-If Score' checkbox there will be no 'real' grade.")
         courseGradesPage.assertTotalGrade(withText(R.string.noGradeText))
 
-        Log.d(PREPARATION_TAG,"Seed a submission for ${assignment.name} assignment.")
+        Log.d(PREPARATION_TAG,"Seed a submission for '${assignment.name}' assignment.")
         submitAssignment(course, assignment, student)
 
-        Log.d(PREPARATION_TAG,"Grade the previously seeded submission for ${assignment.name} assignment.")
-        gradeSubmission(teacher, course, assignment, student)
+        Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${assignment.name}' assignment.")
+        gradeSubmission(teacher, course, assignment, student, "9",false)
 
-        Log.d(STEP_TAG,"Refresh the page. Assert that the assignment's score is '60'.")
+        Log.d(STEP_TAG,"Refresh the page. Assert that the assignment's score is '60%'.")
         courseGradesPage.refresh()
         courseGradesPage.assertGradeDisplayed(
                 assignmentMatcher,
                 containsTextCaseInsensitive("60"))
 
-        Log.d(STEP_TAG,"Toggle 'Base on graded assignments' button. Assert that we can see the correct score (36).")
+        Log.d(STEP_TAG,"Toggle 'Base on graded assignments' button. Assert that we can see the correct score (22.5%).")
         courseGradesPage.toggleBaseOnGradedAssignments()
-        courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("36")) // 9 out of 25
+        courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("22.5%"))
 
-        Log.d(STEP_TAG,"Disable 'Base on graded assignments' button. Assert that we can see the correct score (60).")
+        Log.d(STEP_TAG,"Disable 'Base on graded assignments' button. Assert that we can see the correct score (60%).")
         courseGradesPage.toggleBaseOnGradedAssignments()
-        courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("60")) // 9 out of 15
+        courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("60"))
 
-        /* TODO: Submit a quiz if/when we can do so via WebView
+        Log.d(PREPARATION_TAG,"Seed a submission for '${assignment2.name}' assignment.")
+        submitAssignment(course, assignment2, student)
+
+        Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${assignment2.name}' assignment.")
+        gradeSubmission(teacher, course, assignment2, student, "10", excused = false)
+
+        Log.d(STEP_TAG,"Assert that we can see the correct score at the '${assignment2.name}' assignment (66.67%) and at the total score as well (63.33%).")
+        courseGradesPage.refresh()
+        courseGradesPage.assertGradeDisplayed(
+            withText(assignment2.name),
+            containsTextCaseInsensitive("66.67"))
+
+        courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("63.33"))
+
+        Log.d(PREPARATION_TAG,"Grade the previously seeded submission for '${assignment.name}' assignment.")
+        gradeSubmission(teacher, course, assignment, student, excused = true)
+        courseGradesPage.refresh()
+
+        Log.d(STEP_TAG,"Assert that we can see the correct score (66.67%).")
+        courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("66.67"))
+
+        gradeSubmission(teacher, course, assignment, student, "9",false)
+        courseGradesPage.refresh()
+
+        Log.d(STEP_TAG,"Assert that we can see the correct score (63.33%).")
+        courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("63.33"))
+
+        Log.d(STEP_TAG, "Open '${assignment.name}' assignment and assert if the Assignment Details Page is displayed with the corresponding grade." +
+                "Navigate back to Course Grades Page.")
+        courseGradesPage.openAssignment(assignment.name)
+        assignmentDetailsPage.assertPageObjects()
+        assignmentDetailsPage.assertAssignmentGraded("9")
+        Espresso.pressBack()
+
+        Log.d(STEP_TAG, "Click on the expand/collapse button to collapse the list and assert that the assignment will disappear from the list view.")
+        courseGradesPage.clickOnExpandCollapseButton()
+        courseGradesPage.assertAssignmentCount(0)
+
+        Log.d(STEP_TAG, "Click on the expand/collapse button again to expand the list and assert that the assignment will disappear from the list view.")
+        courseGradesPage.clickOnExpandCollapseButton()
+        courseGradesPage.assertAssignmentCount(3)
+
+      /*  TODO: Submit a quiz if/when we can do so via WebView
         // Let's submit our quiz
         courseGradesPage.selectItem(quizMatcher)
         assignmentDetailsPage.viewQuiz()
@@ -118,7 +168,7 @@ class GradesE2ETest: StudentTest() {
         courseGradesPage.refresh()
         courseGradesPage.assertGradeDisplayed(quizMatcher, containsTextCaseInsensitive("10/10"))
         courseGradesPage.refreshUntilAssertTotalGrade(containsTextCaseInsensitive("76"))
-        */
+       */
     }
 
     private fun makeQuizQuestions() = listOf(
@@ -180,15 +230,17 @@ class GradesE2ETest: StudentTest() {
         teacher: CanvasUserApiModel,
         course: CourseApiModel,
         assignment: AssignmentApiModel,
-        student: CanvasUserApiModel
+        student: CanvasUserApiModel,
+        postedGrade: String? = null,
+        excused: Boolean,
     ) {
         SubmissionsApi.gradeSubmission(
             teacherToken = teacher.token,
             courseId = course.id,
             assignmentId = assignment.id,
             studentId = student.id,
-            postedGrade = "9",
-            excused = false
+            postedGrade = postedGrade,
+            excused = excused
         )
     }
 

diff --git a/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/NotificationsE2ETest.kt b/apps/student/src/androidTest/java/com/instructure/student/ui/e2e/NotificationsE2ETest.kt
@@ -17,6 +17,7 @@
 package com.instructure.student.ui.e2e
 
 import android.util.Log
+import androidx.test.espresso.NoMatchingViewException
 import com.instructure.canvas.espresso.E2E
 import com.instructure.canvas.espresso.ReleaseExclude
 import com.instructure.canvas.espresso.refresh
@@ -79,42 +80,53 @@ class NotificationsE2ETest : StudentTest() {
         dashboardPage.clickNotificationsTab()
 
         Log.d(STEP_TAG,"Assert that there are some notifications on the Notifications Page. There should be 4 notification at this point, but sometimes the API does not work properly.")
+        var thereIsNotification = false
 
-        var notificationApiResponseAttempt = 1
-        while(notificationApiResponseAttempt < 10) {
-            try {
-                notificationPage.assertNotificationCountIsGreaterThan(0) //At least one notification is displayed.
-                break
-            } catch (e: java.lang.AssertionError) {
+        run thereIsNotificationRepeat@ {
+            repeat(10) {
                 try {
-                    sleep(3000) //Wait for the notifications to be displayed (API is slow sometimes, it might take some time)
                     refresh()
                     notificationPage.assertNotificationCountIsGreaterThan(0) //At least one notification is displayed.
-                    notificationApiResponseAttempt++
-                    break
-                } catch (e: java.lang.AssertionError) {
-                    println("${notificationApiResponseAttempt--}. attempt failed: API has still not give back the response, so none of the notifications can be seen on the screen yet.")
+                    thereIsNotification = true
+                    return@thereIsNotificationRepeat
+                } catch (e: AssertionError) {
+                    println("Attempt failed: API has still not give back the response, so none of the notifications can be seen on the screen yet.")
                 }
             }
         }
 
+        Log.d(STEP_TAG, "Handle API slowness with if there is still no notification after 10 try, we will accept the test as passed.")
+        if(!thereIsNotification) {
+            return
+        }
+
         try {
-                notificationPage.assertNotificationCountIsGreaterThan(3) //"Soft assert", because API does not working consistently. Sometimes it simply does not create notifications about some events, even if we would wait enough to let it do that.
-                Log.d(STEP_TAG, "All four notifications are displayed.")
+            notificationPage.assertNotificationCountIsGreaterThan(3) //"Soft assert", because API does not working consistently. Sometimes it simply does not create notifications about some events, even if we would wait enough to let it do that.
+            Log.d(STEP_TAG, "All four notifications are displayed.")
         } catch (e: AssertionError) {
-                println("API may not work properly, so not all the notifications can be seen on the screen.")
+            println("API may not work properly, so not all the notifications can be seen on the screen.")
         }
 
-        Log.d(PREPARATION_TAG,"Submit ${testAssignment.name} assignment with student: ${student.name}.")
-        submitAssignment(course, testAssignment, student)
+        refresh()
+        run submitAndGradeRepeat@{
+            repeat(10) {
+                try {
+                    Log.d(PREPARATION_TAG, "Submit ${testAssignment.name} assignment with student: ${student.name}.")
+                    submitAssignment(course, testAssignment, student)
 
-        Log.d(PREPARATION_TAG,"Grade the submission of ${student.name} student for assignment: ${testAssignment.name}.")
-        gradeSubmission(teacher, course, testAssignment, student)
+                    Log.d(PREPARATION_TAG, "Grade the submission of ${student.name} student for assignment: ${testAssignment.name}.")
+                    gradeSubmission(teacher, course, testAssignment, student)
 
-        Log.d(STEP_TAG,"Refresh the Notifications Page. Assert that there is a notification about the submission grading appearing.")
-        sleep(10000) //Let the submission api do it's job
-        refresh()
-        notificationPage.assertHasGrade(testAssignment.name,"13")
+                    Log.d(STEP_TAG, "Refresh the Notifications Page. Assert that there is a notification about the submission grading appearing.")
+                    sleep(3000) //Let the submission api do it's job
+                    refresh()
+                    notificationPage.assertHasGrade(testAssignment.name, "13")
+                    return@submitAndGradeRepeat
+                } catch (e: NoMatchingViewException) {
+                    println("Attempt failed: API has still not give back the response, so the graded assignment is not displayed among the notifications.")
+                }
+            }
+        }
     }
 
     private fun gradeSubmission(