Skip to content

[MBL-19970][All] - Fix Help Menu E2E tests #3664

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
kdeakinstructure merged 4 commits into from
Apr 29, 2026
Merged

[MBL-19970][All] - Fix Help Menu E2E tests #3664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b3d28c
Fix breaking Help Menu E2E tests in all the apps (Changed some string…
kdeakinstructure Apr 24, 2026
db45017
Fix click shareContributionLabel method text in parent and teacher.
kdeakinstructure Apr 24, 2026
d144366
Rename click method on Share a Contribution and correct some comments…
kdeakinstructure Apr 29, 2026
e858cc5
Merge branch 'master' into MBL-19970-fix-breaking-e2e-tests
kdeakinstructure Apr 29, 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
2 changes: 1 addition & 1 deletion apps/parent/src/androidTest/java/com/instructure/parentapp/ui/e2e/classic/HelpMenuE2ETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class HelpMenuE2ETest : ParentComposeTest() {

try {
helpPage.assertHelpMenuURL(HelpMenu.SEARCH_GUIDES_TITLE, "https://community.instructure.com/en/all-guides")
helpPage.assertHelpMenuURL(HelpMenu.SUBMIT_FEATURE_TITLE, "https://community.canvaslms.com/t5/Idea-Conversations/idb-p/ideas")
helpPage.assertHelpMenuURL(HelpMenu.SHARE_A_CONTRIBUTION_TITLE, "https://community.instructure.com/en/categories/product-connection")
helpPage.assertHelpMenuURL(HelpMenu.SHARE_LOVE_TITLE, "market://details?id=com.instructure.parentapp")
}
finally {
Expand Down
12 changes: 6 additions & 6 deletions apps/parent/src/androidTest/java/com/instructure/parentapp/ui/pages/classic/HelpPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class HelpPage : BasePage(R.id.helpDialog) {

private val reportProblemLabel by OnViewWithStringTextIgnoreCase("Report a Problem")

private val submitFeatureLabel by OnViewWithStringTextIgnoreCase("Submit a Feature Idea")
private val shareContributionLabel by OnViewWithStringTextIgnoreCase("Share a Contribution")
Comment thread
kdeakinstructure marked this conversation as resolved.

private val shareLoveLabel by OnViewWithText(R.string.shareYourLove)

Expand All @@ -58,8 +58,8 @@ class HelpPage : BasePage(R.id.helpDialog) {
reportProblemLabel.scrollTo().click()
}

private fun clickSubmitFeatureLabel() {
submitFeatureLabel.scrollTo().click()
private fun clickShareContributionLabel() {
shareContributionLabel.scrollTo().click()
}

private fun clickShareLoveLabel() {
Expand Down Expand Up @@ -101,8 +101,8 @@ class HelpPage : BasePage(R.id.helpDialog) {
onView(withId(R.id.title) + withText(HelpMenu.REPORT_PROBLEM_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.REPORT_PROBLEM_SUBTITLE)).assertDisplayed()

onView(withId(R.id.title) + withText(HelpMenu.SUBMIT_FEATURE_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SUBMIT_FEATURE_SUBTITLE)).assertDisplayed()
onView(withId(R.id.title) + withText(HelpMenu.SHARE_A_CONTRIBUTION_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SHARE_A_CONTRIBUTION_SUBTITLE)).assertDisplayed()

onView(withId(R.id.title) + withText(HelpMenu.SHARE_LOVE_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SHARE_LOVE_SUBTITLE)).assertDisplayed()
Expand All @@ -119,7 +119,7 @@ class HelpPage : BasePage(R.id.helpDialog) {

when (helpMenuText) {
HelpMenu.SEARCH_GUIDES_TITLE -> clickSearchGuidesLabel()
HelpMenu.SUBMIT_FEATURE_TITLE -> clickSubmitFeatureLabel()
HelpMenu.SHARE_A_CONTRIBUTION_TITLE -> clickShareContributionLabel()
HelpMenu.SHARE_LOVE_TITLE -> clickShareLoveLabel()
}

Expand Down
2 changes: 1 addition & 1 deletion apps/student/src/androidTest/java/com/instructure/student/ui/e2e/classic/HelpMenuE2ETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class HelpMenuE2ETest : StudentTest() {

try {
helpPage.assertHelpMenuURL(HelpMenu.SEARCH_GUIDES_TITLE, "https://community.instructure.com/en/all-guides")
helpPage.assertHelpMenuURL(HelpMenu.SUBMIT_FEATURE_TITLE, "https://community.canvaslms.com/t5/Idea-Conversations/idb-p/ideas")
helpPage.assertHelpMenuURL(HelpMenu.SHARE_A_CONTRIBUTION_TITLE, "https://community.instructure.com/en/categories/product-connection")
helpPage.assertHelpMenuURL(HelpMenu.SHARE_LOVE_TITLE, "market://details?id=com.instructure.candroid")
}
finally {
Expand Down
12 changes: 6 additions & 6 deletions apps/student/src/androidTest/java/com/instructure/student/ui/pages/classic/HelpPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class HelpPage : BasePage(R.id.helpDialog) {
private val askInstructorLabel by OnViewWithText(R.string.askInstructor)
private val searchGuidesLabel by OnViewWithText(R.string.searchGuides)
private val reportProblemLabel by OnViewWithStringTextIgnoreCase("Report a Problem")
private val submitFeatureLabel by OnViewWithStringTextIgnoreCase("Submit a Feature Idea")
private val shareContributionLabel by OnViewWithStringTextIgnoreCase("Share a Contribution")
Comment thread
kdeakinstructure marked this conversation as resolved.
private val shareLoveLabel by OnViewWithText(R.string.shareYourLove)

fun assertAskYourInstructorDialogDetails(course: Course, question: String) {
Expand Down Expand Up @@ -109,8 +109,8 @@ class HelpPage : BasePage(R.id.helpDialog) {
shareLoveLabel.scrollTo().click()
}

fun clickSubmitFeatureLabel() {
submitFeatureLabel.scrollTo().click()
fun clickShareContributionLabel() {
shareContributionLabel.scrollTo().click()
}

fun assertHelpMenuDisplayed() {
Expand All @@ -132,8 +132,8 @@ class HelpPage : BasePage(R.id.helpDialog) {
onView(withId(R.id.title) + withText(HelpMenu.REPORT_PROBLEM_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.REPORT_PROBLEM_SUBTITLE)).assertDisplayed()

onView(withId(R.id.title) + withText(HelpMenu.SUBMIT_FEATURE_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SUBMIT_FEATURE_SUBTITLE)).assertDisplayed()
onView(withId(R.id.title) + withText(HelpMenu.SHARE_A_CONTRIBUTION_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SHARE_A_CONTRIBUTION_SUBTITLE)).assertDisplayed()

onView(withId(R.id.title) + withText(HelpMenu.SHARE_LOVE_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SHARE_LOVE_SUBTITLE)).assertDisplayed()
Expand All @@ -157,7 +157,7 @@ class HelpPage : BasePage(R.id.helpDialog) {

when (helpMenuText) {
HelpMenu.SEARCH_GUIDES_TITLE -> clickSearchGuidesLabel()
HelpMenu.SUBMIT_FEATURE_TITLE -> clickSubmitFeatureLabel()
HelpMenu.SHARE_A_CONTRIBUTION_TITLE -> clickShareContributionLabel()
HelpMenu.SHARE_LOVE_TITLE -> clickShareLoveLabel()
}

Expand Down
2 changes: 1 addition & 1 deletion apps/teacher/src/androidTest/java/com/instructure/teacher/ui/e2e/classic/HelpMenuE2ETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class HelpMenuE2ETest: TeacherTest() {

try {
helpPage.assertHelpMenuURL(HelpMenu.SEARCH_GUIDES_TITLE, "https://community.instructure.com/en/all-guides")
helpPage.assertHelpMenuURL(HelpMenu.SUBMIT_FEATURE_TITLE, "https://community.canvaslms.com/t5/Idea-Conversations/idb-p/ideas")
helpPage.assertHelpMenuURL(HelpMenu.SHARE_A_CONTRIBUTION_TITLE, "https://community.instructure.com/en/categories/product-connection")
helpPage.assertHelpMenuURL(HelpMenu.Teacher.ASK_COMMUNITY_TITLE, "https://community.instructure.com")
helpPage.assertHelpMenuURL(HelpMenu.Teacher.CONFERENCE_GUIDES_TITLE, "https://community.canvaslms.com/docs/DOC-18572-conferences-resources")
helpPage.assertHelpMenuURL(HelpMenu.SHARE_LOVE_TITLE, "market://details?id=com.instructure.teacher")
Expand Down
16 changes: 8 additions & 8 deletions apps/teacher/src/androidTest/java/com/instructure/teacher/ui/pages/classic/HelpPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ class HelpPage : BasePage(R.id.helpDialog) {
private val reportProblemLabel by OnViewWithText(R.string.report_problem)

/**
* The label for submitting a feature idea.
* The label for sharing a contribution.
*/
private val submitFeatureLabel by OnViewWithStringTextIgnoreCase("Submit a Feature Idea")
private val shareContributionLabel by OnViewWithStringTextIgnoreCase("Share a Contribution")
Comment thread
kdeakinstructure marked this conversation as resolved.

/**
* The label for sharing your love.
Expand Down Expand Up @@ -136,10 +136,10 @@ class HelpPage : BasePage(R.id.helpDialog) {
}

/**
* Clicks on the 'Submit a Feature Idea' help menu.
* Clicks on the 'Share a Contribution' help menu.
*/
private fun clickSubmitFeatureLabel() {
submitFeatureLabel.scrollTo().click()
private fun clickShareContributionLabel() {
shareContributionLabel.scrollTo().click()
}

/**
Expand Down Expand Up @@ -170,8 +170,8 @@ class HelpPage : BasePage(R.id.helpDialog) {
onView(withId(R.id.title) + withText(HelpMenu.Teacher.ASK_COMMUNITY_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.Teacher.ASK_COMMUNITY_SUBTITLE)).assertDisplayed()

onView(withId(R.id.title) + withText(HelpMenu.SUBMIT_FEATURE_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SUBMIT_FEATURE_SUBTITLE)).assertDisplayed()
onView(withId(R.id.title) + withText(HelpMenu.SHARE_A_CONTRIBUTION_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.SHARE_A_CONTRIBUTION_SUBTITLE)).assertDisplayed()

onView(withId(R.id.title) + withText(HelpMenu.Teacher.TRAINING_PORTAL_TITLE)).assertDisplayed()
onView(withId(R.id.subtitle) + withText(HelpMenu.Teacher.TRAINING_PORTAL_SUBTITLE)).assertDisplayed()
Expand All @@ -197,7 +197,7 @@ class HelpPage : BasePage(R.id.helpDialog) {

when (helpMenuText) {
HelpMenu.SEARCH_GUIDES_TITLE -> clickSearchGuidesLabel()
HelpMenu.SUBMIT_FEATURE_TITLE -> clickSubmitFeatureLabel()
HelpMenu.SHARE_A_CONTRIBUTION_TITLE -> clickShareContributionLabel()
HelpMenu.SHARE_LOVE_TITLE -> clickShareLoveLabel()
HelpMenu.Teacher.CONFERENCE_GUIDES_TITLE -> clickConferenceGuidesForRemoteClassroomsLabel()
HelpMenu.Teacher.ASK_COMMUNITY_TITLE -> clickAskTheCommunityLabel()
Expand Down
4 changes: 2 additions & 2 deletions automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/StringConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ object StringConstants {
const val REPORT_PROBLEM_TITLE = "Report a Problem"
const val REPORT_PROBLEM_SUBTITLE = "If Canvas misbehaves, tell us about it."

const val SUBMIT_FEATURE_TITLE = "Submit a Feature Idea"
const val SUBMIT_FEATURE_SUBTITLE = "Have an idea to improve Canvas?"
const val SHARE_A_CONTRIBUTION_TITLE = "Share a Contribution"
const val SHARE_A_CONTRIBUTION_SUBTITLE = "Have a suggestion for Instructure's product roadmap?"

const val SHARE_LOVE_TITLE = "Share Your Love for the App"
const val SHARE_LOVE_SUBTITLE = "Tell us about your favorite parts of the app"
Expand Down
Loading