Skip to content

Merge Teacher release #3624

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

Merged
tamaskozmer merged 8 commits into from
Apr 7, 2026
Merged

Merge Teacher release #3624

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9e4111
Version bump.
tamaskozmer Mar 23, 2026
bfe52fa
Fix token handling in e2e tests according to new login flow. (#3600)
kdeakinstructure Mar 23, 2026
551b04d
[MBL-19864][All] - Fix New Login UI changes in E2E tests (#3602)
kdeakinstructure Mar 24, 2026
9fd3019
GraphQLClientModule fix
kristofnemere Mar 24, 2026
6d10911
Exclude flaky tests
tamaskozmer Mar 24, 2026
2d7cc8e
Release Teacher 2.6.0 (91)
tamaskozmer Mar 30, 2026
ed48bef
Merge branch 'master' into merge-teacher-release-master
tamaskozmer Apr 7, 2026
d367d14
Removed ReleaseExclude annotations.
tamaskozmer Apr 7, 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
4 changes: 2 additions & 2 deletions apps/teacher/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ android {
defaultConfig {
minSdkVersion Versions.MIN_SDK
targetSdkVersion Versions.TARGET_SDK
versionCode = 90
versionName = '2.5.1'
versionCode = 91
versionName = '2.6.0'
vectorDrawables.useSupportLibrary = true
testInstrumentationRunner 'com.instructure.teacher.espresso.TeacherHiltTestRunner'
testInstrumentationRunnerArguments disableAnalytics: 'true'
Expand Down
3 changes: 3 additions & 0 deletions apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/LoginE2ETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import com.instructure.canvas.espresso.SecondaryFeatureCategory
import com.instructure.canvas.espresso.TestCategory
import com.instructure.canvas.espresso.TestMetaData
import com.instructure.canvas.espresso.annotations.E2E
import com.instructure.canvas.espresso.annotations.ReleaseExclude
import com.instructure.canvas.espresso.annotations.Stub
import com.instructure.canvas.espresso.pressBackButton
import com.instructure.canvasapi2.utils.ApiPrefs
Expand All @@ -49,6 +50,7 @@ class LoginE2ETest : TeacherTest() {

@E2E
@Test
@ReleaseExclude

@claude claude Bot Apr 7, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The @ReleaseExclude annotation supports an excludeReason parameter specifically to document why the test is excluded from the release process. The annotation's own KDoc says the reason should be "explained in the parameter". Without it, future maintainers won't know whether this exclusion is intentional, temporary, or forgotten.

Suggested change
@ReleaseExclude
@ReleaseExclude(excludeReason = "<describe the reason, e.g. flaky due to X>")

@TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.E2E)
fun testLoginE2E() {

Expand Down Expand Up @@ -143,6 +145,7 @@ class LoginE2ETest : TeacherTest() {

@E2E
@Test
@ReleaseExclude

@claude claude Bot Apr 7, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above — please include an excludeReason so the intent is clear.

Suggested change
@ReleaseExclude
@ReleaseExclude(excludeReason = "<describe the reason, e.g. flaky due to X>")

@TestMetaData(Priority.MANDATORY, FeatureCategory.LOGIN, TestCategory.E2E)
fun testLoginE2EWithLastSavedSchool() {

Expand Down
Loading