diff --git a/.eslintrc b/.eslintrc index e8865a8e0616..cf9e7d18c95f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -75,7 +75,6 @@ "additionalPlayerFeatures.js", "adminTabFeatures.js", "classroomPage.js", - "classroomPageFileUploadFeatures.js", "collections.js", "contributorDashboard.js", "coreEditorAndPlayerFeatures.js", diff --git a/core/templates/pages/classroom-admin-page/classroom-admin-page.component.html b/core/templates/pages/classroom-admin-page/classroom-admin-page.component.html index be8fdf59768b..646e47cabcf6 100644 --- a/core/templates/pages/classroom-admin-page/classroom-admin-page.component.html +++ b/core/templates/pages/classroom-admin-page/classroom-admin-page.component.html @@ -17,7 +17,7 @@

Classroom details

- + {{ classroom.value }} @@ -27,6 +27,7 @@

Classroom details

[New Classroom] -
diff --git a/core/templates/pages/classroom-admin-page/modals/topic-dependency-graph-viz-modal.component.html b/core/templates/pages/classroom-admin-page/modals/topic-dependency-graph-viz-modal.component.html index bca6251cdf85..790580971975 100644 --- a/core/templates/pages/classroom-admin-page/modals/topic-dependency-graph-viz-modal.component.html +++ b/core/templates/pages/classroom-admin-page/modals/topic-dependency-graph-viz-modal.component.html @@ -1,4 +1,4 @@ -
+

Graph visualization

@@ -8,7 +8,7 @@

Graph visualization

- + Graph visualization
- diff --git a/core/templates/pages/classroom-page/classroom-page.component.html b/core/templates/pages/classroom-page/classroom-page.component.html index fa07363fb8da..d0a62ee97bc4 100644 --- a/core/templates/pages/classroom-page/classroom-page.component.html +++ b/core/templates/pages/classroom-page/classroom-page.component.html @@ -24,8 +24,8 @@
{{ 'I18N_CLASSROOM_HEADING' | translate:{ classroomName: classroomData.getName() } }} -

{{classroomData.getName()}}

-

{{classroomTranslationKeys.name | translate}}

+

{{classroomData.getName()}}

+

{{classroomTranslationKeys.name | translate}}

Classroom thumbnail image diff --git a/core/templates/pages/error-pages/error-page.component.html b/core/templates/pages/error-pages/error-page.component.html index 9eafd67a470e..9ee1a372d788 100644 --- a/core/templates/pages/error-pages/error-page.component.html +++ b/core/templates/pages/error-pages/error-page.component.html @@ -5,19 +5,19 @@

- + - Bad Request
- + - Unauthorized
- + - Page Not Found
- + - System Error

diff --git a/core/tests/ci-test-suite-configs/acceptance.json b/core/tests/ci-test-suite-configs/acceptance.json index c1a060001282..8dd834938792 100644 --- a/core/tests/ci-test-suite-configs/acceptance.json +++ b/core/tests/ci-test-suite-configs/acceptance.json @@ -16,6 +16,10 @@ "name": "blog-editor/try-to-publish-a-duplicate-blog-post-and-get-blocked", "module": "core/tests/puppeteer-acceptance-tests/specs/blog-editor/try-to-publish-a-duplicate-blog-post-and-get-blocked.spec.ts" }, + { + "name": "curriculum-admin/create-edit-and-delete-classroom", + "module": "core/tests/puppeteer-acceptance-tests/specs/curriculum-admin/create-edit-and-delete-classroom.spec.ts" + }, { "name": "curriculum-admin/create-publish-unpublish-and-delete-topic-and-skill", "module": "core/tests/puppeteer-acceptance-tests/specs/curriculum-admin/create-publish-unpublish-and-delete-topic-and-skill.spec.ts" @@ -104,6 +108,10 @@ "name": "logged-out-user/click-all-buttons-on-donate-page", "module": "core/tests/puppeteer-acceptance-tests/specs/logged-out-user/click-all-buttons-on-donate-page.spec.ts" }, + { + "name": "logged-out-user/visit-classroom-index-page", + "module": "core/tests/puppeteer-acceptance-tests/specs/logged-out-user/visit-classroom-index-page.spec.ts" + }, { "name": "moderator/edit-featured-activities-list", "module": "core/tests/puppeteer-acceptance-tests/specs/moderator/edit-featured-activities-list.spec.ts" diff --git a/core/tests/ci-test-suite-configs/e2e.json b/core/tests/ci-test-suite-configs/e2e.json index fabdfc1c90e3..b676912bfa9b 100644 --- a/core/tests/ci-test-suite-configs/e2e.json +++ b/core/tests/ci-test-suite-configs/e2e.json @@ -32,10 +32,6 @@ "name": "classroomPage", "module": "core/tests/webdriverio_desktop/classroomPage.js" }, - { - "name": "classroomPageFileUploadFeatures", - "module": "core/tests/webdriverio_desktop/classroomPageFileUploadFeatures.js" - }, { "name": "collections", "module": "core/tests/webdriverio_desktop/collections.js" diff --git a/core/tests/puppeteer-acceptance-tests/data/classroom-banner.png b/core/tests/puppeteer-acceptance-tests/data/classroom-banner.png new file mode 100644 index 000000000000..90068d49ff3f Binary files /dev/null and b/core/tests/puppeteer-acceptance-tests/data/classroom-banner.png differ diff --git a/core/tests/puppeteer-acceptance-tests/specs/curriculum-admin/create-edit-and-delete-classroom.spec.ts b/core/tests/puppeteer-acceptance-tests/specs/curriculum-admin/create-edit-and-delete-classroom.spec.ts new file mode 100644 index 000000000000..7af5d46c088d --- /dev/null +++ b/core/tests/puppeteer-acceptance-tests/specs/curriculum-admin/create-edit-and-delete-classroom.spec.ts @@ -0,0 +1,98 @@ +// Copyright 2024 The Oppia Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS-IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @fileoverview Acceptance Test for Creating, Updating, Publishing, and Deleting a Classroom by a Curriculum Admin. + */ + +import {UserFactory} from '../../utilities/common/user-factory'; +import testConstants from '../../utilities/common/test-constants'; +import {CurriculumAdmin} from '../../utilities/user/curriculum-admin'; +import {LoggedOutUser} from '../../utilities/user/logged-out-user'; +import {ConsoleReporter} from '../../utilities/common/console-reporter'; + +const DEFAULT_SPEC_TIMEOUT_MSECS = testConstants.DEFAULT_SPEC_TIMEOUT_MSECS; +const ROLES = testConstants.Roles; + +ConsoleReporter.setConsoleErrorsToIgnore([/[\s\S]*/]); + +describe('Curriculum Admin', function () { + let curriculumAdmin: CurriculumAdmin; + let loggedOutUser: LoggedOutUser; + + beforeAll(async function () { + curriculumAdmin = await UserFactory.createNewUser( + 'curriculumAdm', + 'curriculum_admin@example.com', + [ROLES.CURRICULUM_ADMIN] + ); + + loggedOutUser = await UserFactory.createLoggedOutUser(); + + await curriculumAdmin.navigateToTopicAndSkillsDashboardPage(); + await curriculumAdmin.createTopic('Test Topic 1', 'test-topic-one'); + await curriculumAdmin.createSubtopicForTopic( + 'Test Subtopic 1', + 'test-subtopic-one', + 'Test Topic 1' + ); + + await curriculumAdmin.createSkillForTopic('Test Skill 1', 'Test Topic 1'); + await curriculumAdmin.createQuestionsForSkill('Test Skill 1', 3); + await curriculumAdmin.assignSkillToSubtopicInTopicEditor( + 'Test Skill 1', + 'Test Subtopic 1', + 'Test Topic 1' + ); + await curriculumAdmin.addSkillToDiagnosticTest( + 'Test Skill 1', + 'Test Topic 1' + ); + + await curriculumAdmin.publishDraftTopic('Test Topic 1'); + }, DEFAULT_SPEC_TIMEOUT_MSECS); + + it( + 'should create, publish and delete a classroom.', + async function () { + await curriculumAdmin.expectNumberOfClassroomsToBe(0); + await curriculumAdmin.createNewClassroom('Math', 'math'); + await curriculumAdmin.expectNumberOfClassroomsToBe(1); + await curriculumAdmin.updateClassroom( + 'Math', + 'Teaser text', + 'Course details', + 'Topic list intro' + ); + await curriculumAdmin.addTopicToClassroom('Math', 'Test Topic 1'); + await curriculumAdmin.publishClassroom('Math'); + await curriculumAdmin.expectNumberOfTopicsInTopicDependencyGraphToBe( + 'Math', + 1 + ); + + await loggedOutUser.navigateToClassroomPage('math'); + await loggedOutUser.expectToBeOnClassroomPage('Math'); + + await curriculumAdmin.deleteClassroom('Math'); + await curriculumAdmin.expectNumberOfClassroomsToBe(0); + }, + + DEFAULT_SPEC_TIMEOUT_MSECS + ); + + afterAll(async function () { + await UserFactory.closeAllBrowsers(); + }); +}); diff --git a/core/tests/puppeteer-acceptance-tests/specs/logged-out-user/visit-classroom-index-page.spec.ts b/core/tests/puppeteer-acceptance-tests/specs/logged-out-user/visit-classroom-index-page.spec.ts new file mode 100644 index 000000000000..e2230f0e48a9 --- /dev/null +++ b/core/tests/puppeteer-acceptance-tests/specs/logged-out-user/visit-classroom-index-page.spec.ts @@ -0,0 +1,53 @@ +// Copyright 2024 The Oppia Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS-IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @fileoverview Acceptance test for checking the behavior of the classroom index page + * for 0 classrooms, 1 classroom, and more than 1 classroom. + */ + +import {UserFactory} from '../../utilities/common/user-factory'; +import testConstants from '../../utilities/common/test-constants'; +import {LoggedOutUser} from '../../utilities/user/logged-out-user'; +import {ConsoleReporter} from '../../utilities/common/console-reporter'; + +const DEFAULT_SPEC_TIMEOUT_MSECS = testConstants.DEFAULT_SPEC_TIMEOUT_MSECS; + +ConsoleReporter.setConsoleErrorsToIgnore([ + /http:\/\/localhost:8181\/access_validation_handler\/can_access_classrooms_page Failed to load resource: the server responded with a status of 404 \(Not Found\)/, +]); + +describe('Logged-out User', function () { + let loggedOutUser: LoggedOutUser; + + beforeAll(async function () { + loggedOutUser = await UserFactory.createLoggedOutUser(); + }, DEFAULT_SPEC_TIMEOUT_MSECS); + + it( + 'should be redirected to a 404 error page if no classrooms are present.', + async function () { + await loggedOutUser.navigateToClassroomsPage(); + await loggedOutUser.expectToBeOnErrorPage(404); + }, + DEFAULT_SPEC_TIMEOUT_MSECS + ); + + // TODO (#20610): Add test for one and more than one classroom. + // Once issue with relase coordinator user is fixed. + + afterAll(async function () { + await UserFactory.closeAllBrowsers(); + }); +}); diff --git a/core/tests/puppeteer-acceptance-tests/utilities/common/test-constants.ts b/core/tests/puppeteer-acceptance-tests/utilities/common/test-constants.ts index fcbf77721e6a..91a5c6bcc991 100644 --- a/core/tests/puppeteer-acceptance-tests/utilities/common/test-constants.ts +++ b/core/tests/puppeteer-acceptance-tests/utilities/common/test-constants.ts @@ -36,6 +36,7 @@ export default { 'in-summer-school-0q6r28fzsrwc', CCLicense: 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', ClassroomAdmin: 'http://localhost:8181/classroom-admin', + ClassroomsPage: 'http://localhost:8181/learn', CommunityLibrary: 'http://localhost:8181/community-library', Contact: 'http://localhost:8181/contact', ContributorDashboard: 'http://localhost:8181/contributor-dashboard', @@ -150,6 +151,10 @@ export default { __dirname, '../../data/curriculum-admin-thumbnail.svg' ), + classroomBannerImage: path.resolve( + __dirname, + '../../data/classroom-banner.png' + ), }, OppiaSocials: { YouTube: { diff --git a/core/tests/puppeteer-acceptance-tests/utilities/user/curriculum-admin.ts b/core/tests/puppeteer-acceptance-tests/utilities/user/curriculum-admin.ts index e75122615b07..775183aee63a 100644 --- a/core/tests/puppeteer-acceptance-tests/utilities/user/curriculum-admin.ts +++ b/core/tests/puppeteer-acceptance-tests/utilities/user/curriculum-admin.ts @@ -22,6 +22,8 @@ import {showMessage} from '../common/show-message'; const curriculumAdminThumbnailImage = testConstants.data.curriculumAdminThumbnailImage; +const classroomBannerImage = testConstants.data.classroomBannerImage; +const classroomAdminUrl = testConstants.URLs.ClassroomAdmin; const topicAndSkillsDashboardUrl = testConstants.URLs.TopicAndSkillsDashboard; const baseURL = testConstants.URLs.BaseURL; @@ -150,6 +152,42 @@ const mobileSettingsButton = 'li.e2e-test-mobile-settings-button'; const explorationControlsSettingsDropdown = 'h3.e2e-test-controls-bar-settings-container'; +const createNewClassroomModal = '.e2e-test-create-new-classroom-modal'; +const createNewClassroomButton = '.e2e-test-add-new-classroom-config'; +const newClassroomNameInputFeild = '.e2e-test-new-classroom-name'; +const newClassroomUrlFragmentInputFeild = + '.e2e-test-new-classroom-url-fragment'; +const saveNewClassroomButton = '.e2e-test-create-new-classroom'; +const classroomTileSelector = '.e2e-test-classroom-tile'; + +const editClassroomConfigButton = '.e2e-test-edit-classroom-config-button'; +const closeClassroomConfigButton = '.e2e-cancel-classroom-changes'; +const editClassroomCourseDetailsInputFeild = + '.e2e-test-update-classroom-course-details'; +const editClassroomTeaserTextInputFeild = + '.e2e-test-update-classroom-teaser-text'; +const editClassroomTopicListIntroInputFeild = + '.e2e-test-update-classroom-topic-list-intro'; +const classroomThumbnailContainer = '.e2e-test-classroom-thumbnail-container'; +const classroomBannerContainer = '.e2e-test-classroom-banner-container'; +const uploadClassroomImageButton = '.e2e-test-photo-upload-submit'; +const imageUploaderModal = '.e2e-test-thumbnail-editor'; +const openTopicDropdownButton = '.e2e-test-add-topic-to-classroom-button'; +const topicDropDownFormFeild = '.e2e-test-classroom-category-dropdown'; +const topicSelector = '.e2e-test-classroom-topic-selector-choice'; +const publishClassroomButton = '.e2e-test-publish-classroom-btn'; +const saveClassroomButton = '.e2e-test-save-classroom-config-button'; +const classroomTileNameSpan = '.e2e-test-classroom-tile-name'; +const deleteClassroomButton = '.e2e-test-delete-classroom-button'; +const deleteClassroomModal = '.e2e-test-delete-classroom-modal'; +const confirmDeleteClassroomButton = '.e2e-test-confirm-delete-classroom'; +const viewTopicGraphButton = 'button.view-graph-button'; +const topicDependencyGraphDiv = '.e2e-test-topic-dependency-graph-container'; +const topicNode = '.e2e-test-topic-node'; +const closeTopicDependencyButton = '.e2e-test-close-topic-dependency-modal'; +const addTopicFormFieldInput = '.mat-input-element'; +const createNewTopicButton = '.e2e-test-create-topic-button'; + export class CurriculumAdmin extends BaseUser { /** * Navigate to the topic and skills dashboard page. @@ -272,7 +310,7 @@ export class CurriculumAdmin extends BaseUser { * Create a topic in the topics-and-skills dashboard. */ async createTopic(name: string, urlFragment: string): Promise { - await this.clickOn('Create Topic'); + await this.clickOn(createNewTopicButton); await this.type(topicNameField, name); await this.type(topicUrlFragmentField, urlFragment); await this.type(topicWebFragmentField, name); @@ -1009,6 +1047,216 @@ export class CurriculumAdmin extends BaseUser { ); } } + + /** + * Function for navigating to the classroom admin page. + */ + async navigateToClassroomAdminPage(): Promise { + await this.page.goto(classroomAdminUrl, { + waitUntil: ['networkidle2', 'load'], + }); + } + + /** + * Function for opening the classroom tile in edit mode. + */ + async editClassroom(classroomName: string): Promise { + await this.navigateToClassroomAdminPage(); + const classroomTiles = await this.page.$$(classroomTileSelector); + + if (classroomTiles.length === 0) { + throw new Error('No classrooms are present.'); + } + let foundClassroom = false; + + for (let i = 0; i < classroomTiles.length; i++) { + const currentClassroomName = await classroomTiles[i].$eval( + classroomTileNameSpan, + element => (element as HTMLSpanElement).innerText.trim() + ); + + if (currentClassroomName === classroomName) { + await this.clickOn(classroomTileSelector); + await this.page.waitForSelector(editClassroomConfigButton); + await this.clickOn(editClassroomConfigButton); + await this.page.waitForSelector(closeClassroomConfigButton); + + foundClassroom = true; + break; + } + } + + if (!foundClassroom) { + throw new Error(`${classroomName} classroom do not exists.`); + } + } + + /** + * Function for creating a new classroom. + */ + async createNewClassroom( + classroomName: string, + urlFragment: string + ): Promise { + await this.navigateToClassroomAdminPage(); + await this.clickOn(createNewClassroomButton); + await this.page.waitForSelector(createNewClassroomModal); + await this.page.type(newClassroomNameInputFeild, classroomName); + await this.page.type(newClassroomUrlFragmentInputFeild, urlFragment); + await this.clickOn(saveNewClassroomButton); + await this.page.waitForSelector(createNewClassroomModal, {visible: false}); + showMessage(`Created ${classroomName} classroom.`); + } + + /** + * Function for updating a classroom. + */ + async updateClassroom( + classroomName: string, + teaserText: string, + courseDetails: string, + topicListIntro: string + ): Promise { + await this.navigateToClassroomAdminPage(); + await this.editClassroom(classroomName); + + await this.page.type(editClassroomTeaserTextInputFeild, teaserText); + await this.page.type(editClassroomTopicListIntroInputFeild, topicListIntro); + await this.page.type(editClassroomCourseDetailsInputFeild, courseDetails); + await this.clickOn(classroomThumbnailContainer); + await this.page.waitForSelector(imageUploaderModal, {visible: true}); + await this.uploadFile(curriculumAdminThumbnailImage); + await this.page.waitForSelector(`${uploadPhotoButton}:not([disabled])`); + await this.clickOn(uploadClassroomImageButton); + await this.page.waitForSelector(imageUploaderModal, {visible: false}); + + await this.page.waitForTimeout(2000); + + await this.clickOn(classroomBannerContainer); + await this.page.waitForSelector(imageUploaderModal, {visible: true}); + await this.uploadFile(classroomBannerImage); + await this.page.waitForSelector(`${uploadPhotoButton}:not([disabled])`); + await this.clickOn(uploadClassroomImageButton); + await this.clickOn(saveClassroomButton); + + showMessage(`Updated ${classroomName} classroom.`); + } + + /** + * Function for adding a topic to a classroom + */ + async addTopicToClassroom( + classroomName: string, + topicName: string + ): Promise { + await this.navigateToClassroomAdminPage(); + await this.editClassroom(classroomName); + + await this.clickOn(openTopicDropdownButton); + await this.clickOn(topicDropDownFormFeild); + await this.page.waitForSelector(addTopicFormFieldInput); + await this.page.type(addTopicFormFieldInput, topicName); + await this.clickOn(topicSelector); + await this.page.waitForSelector(openTopicDropdownButton); + await this.clickOn(saveClassroomButton); + + showMessage(`Added ${topicName} topic to the ${classroomName} classroom.`); + } + + /** + * Function to check number of classrooms present in classroom-admin page. + */ + async expectNumberOfClassroomsToBe(classroomsCount: number): Promise { + await this.navigateToClassroomAdminPage(); + const classroomTiles = await this.page.$$(classroomTileSelector); + + if (classroomTiles.length === classroomsCount) { + showMessage(`There are ${classroomsCount} classrooms present.`); + } else { + throw new Error( + `Expected ${classroomTiles.length} classrooms found ${classroomsCount} classrooms.` + ); + } + } + + /** + * Function for publishing a classroom. + */ + async publishClassroom(classroomName: string): Promise { + await this.navigateToClassroomAdminPage(); + await this.editClassroom(classroomName); + + await this.clickOn(publishClassroomButton); + } + + /** + * Function for deleting a classroom. + */ + async deleteClassroom(classroomName: string): Promise { + await this.navigateToClassroomAdminPage(); + const classroomTiles = await this.page.$$(classroomTileSelector); + + if (classroomTiles.length === 0) { + throw new Error('No classrooms are present.'); + } + + let foundClassroom = false; + + for (let i = 0; i < classroomTiles.length; i++) { + const currentClassroomName = await classroomTiles[i].$eval( + classroomTileNameSpan, + element => (element as HTMLSpanElement).innerText.trim() + ); + + if (currentClassroomName === classroomName) { + const classroomTile = classroomTiles[i]; + await classroomTile.$eval(deleteClassroomButton, element => + (element as HTMLButtonElement).click() + ); + await this.page.waitForSelector(deleteClassroomModal, {visible: true}); + await this.clickOn(confirmDeleteClassroomButton); + await this.page.waitForSelector(deleteClassroomModal, {visible: false}); + + showMessage(`Deleted ${classroomName} classroom.`); + foundClassroom = true; + break; + } + } + + if (!foundClassroom) { + throw new Error(`${classroomName} classroom does not exists.`); + } + } + + /** + * Function for opening topic dependency graph modal. + * And checking the number of topics in a classroom. + */ + async expectNumberOfTopicsInTopicDependencyGraphToBe( + classroomName: string, + numberOfTopics: number + ): Promise { + await this.navigateToClassroomAdminPage(); + await this.editClassroom(classroomName); + + await this.clickOn(viewTopicGraphButton); + await this.page.waitForSelector(topicDependencyGraphDiv); + + const topicNodes = await this.page.$$(topicNode); + + if (topicNodes.length === numberOfTopics) { + showMessage( + `The ${classroomName} classroom has ${numberOfTopics} topics.` + ); + } else { + throw new Error( + `${classroomName} classroom has ${topicNodes.length} topics, expected ${numberOfTopics} topics.` + ); + } + + await this.clickOn(closeTopicDependencyButton); + await this.page.waitForSelector(topicDependencyGraphDiv, {visible: false}); + } } export let CurriculumAdminFactory = (): CurriculumAdmin => diff --git a/core/tests/puppeteer-acceptance-tests/utilities/user/logged-out-user.ts b/core/tests/puppeteer-acceptance-tests/utilities/user/logged-out-user.ts index 7ddd8d83a5d1..e83bebfa0545 100644 --- a/core/tests/puppeteer-acceptance-tests/utilities/user/logged-out-user.ts +++ b/core/tests/puppeteer-acceptance-tests/utilities/user/logged-out-user.ts @@ -31,6 +31,7 @@ const ccLicenseUrl = testConstants.URLs.CCLicense; const communityLibraryUrl = testConstants.URLs.CommunityLibrary; const contactUrl = testConstants.URLs.Contact; const creatingAnExplorationUrl = testConstants.URLs.CreatingAnExploration; +const classroomsPage = testConstants.URLs.ClassroomsPage; const desktopWatchAVideoUrl = testConstants.URLs.DesktopExternalLinkWatchAVideo; const donateUrl = testConstants.URLs.Donate; const electromagnetismUrl = testConstants.URLs.Electromagnetism; @@ -214,6 +215,12 @@ const emailLinkSelector = '.oppia-contact-mail'; const mobileDonateButtonOnDonatePage = '.donate-modal-button'; const donateModalIframeSelector = '.e2e-test-donate-page-iframe'; +const classroomNameHeading = '.e2e-test-classroom-name'; + +const errorPageHeading = '.e2e-test-error-page-heading'; + +const classroomTileContainer = '.oppia-classroom-tile-container'; + export class LoggedOutUser extends BaseUser { /** * Function to navigate to the home page. @@ -309,6 +316,23 @@ export class LoggedOutUser extends BaseUser { await this.goto(contactUrl); } + /** + * Function to navigate to the classroom page. + */ + async navigateToClassroomPage(urlFragment: string): Promise { + await this.goto(`${classroomsPage}/${urlFragment}`); + } + + /** + * Function to navigate to the classrooms page. + */ + async navigateToClassroomsPage(): Promise { + if (this.page.url() === classroomsPage) { + await this.page.reload(); + } + await this.goto(classroomsPage); + } + /** * Function to click a button and check if it opens the expected destination. */ @@ -1830,6 +1854,72 @@ export class LoggedOutUser extends BaseUser { return; } } + + /** + * This function verifies that the user is on the correct classroom page. + */ + async expectToBeOnClassroomPage(classroomName: string): Promise { + await this.page.waitForSelector(classroomNameHeading); + + const buttonText = await this.page.$eval( + classroomNameHeading, + element => (element as HTMLHeadElement).innerText + ); + + if (buttonText !== classroomName) { + throw new Error( + `The ${classroomName} classroom name is not visible. URL: ${this.page.url()}` + ); + } else { + showMessage(`The ${classroomName} classroom name is visible.`); + } + } + + /** + * This function verifies that the classroom cards in classrooms page. + */ + async expectClassroomCountInClassroomsPageToBe( + classroomsCount: number + ): Promise { + await this.page.waitForSelector(classroomTileContainer); + const classroomTiles = await this.page.$$(classroomTileContainer); + + if (classroomTiles.length === classroomsCount) { + showMessage( + `${classroomsCount} classrooms are present in classrooms page.` + ); + } else { + throw new Error( + `Expect ${classroomsCount} classrooms to be present in classrooms page, found: ${classroomTiles.length} classrooms.` + ); + } + } + + /** + * This function verifies that the user is on the correct classroom page. + */ + async expectToBeOnErrorPage(statusCode: number): Promise { + await this.page.waitForSelector(errorPageHeading); + + const errorText = await this.page.$eval( + errorPageHeading, + element => (element as HTMLSpanElement).textContent + ); + + if (!errorText) { + throw new Error(`Error text is not visible. URL: ${this.page.url()}`); + } + + const currentStatusCode = Number(errorText.split(' ')[1]); + + if (currentStatusCode !== statusCode) { + throw new Error( + `Expected status code to be ${statusCode}, found: ${currentStatusCode}` + ); + } + + showMessage(`User is on error page with status code ${statusCode}.`); + } } export let LoggedOutUserFactory = (): LoggedOutUser => new LoggedOutUser(); diff --git a/core/tests/test-dependencies/test-to-modules-matcher.ts b/core/tests/test-dependencies/test-to-modules-matcher.ts index cf915af759fe..d435d0aa70e6 100644 --- a/core/tests/test-dependencies/test-to-modules-matcher.ts +++ b/core/tests/test-dependencies/test-to-modules-matcher.ts @@ -120,7 +120,7 @@ export class TestToModulesMatcher { * Registers a URL and matches it with an Angular module. */ public static registerUrl(url: string): void { - if (!url.startsWith(LOCALHOST_URL)) { + if (!url.startsWith(LOCALHOST_URL) || url.includes('/error')) { return; } const path = url.replace(LOCALHOST_URL, ''); diff --git a/core/tests/test-modules-mappings/acceptance/curriculum-admin/create-edit-and-delete-classroom.txt b/core/tests/test-modules-mappings/acceptance/curriculum-admin/create-edit-and-delete-classroom.txt new file mode 100644 index 000000000000..3e416dbe94cb --- /dev/null +++ b/core/tests/test-modules-mappings/acceptance/curriculum-admin/create-edit-and-delete-classroom.txt @@ -0,0 +1,5 @@ +core/templates/pages/classroom-admin-page/classroom-admin-page.module.ts +core/templates/pages/classroom-page/classroom-page.module.ts +core/templates/pages/skill-editor-page/skill-editor-page.import.ts +core/templates/pages/topic-editor-page/topic-editor-page.import.ts +core/templates/pages/topics-and-skills-dashboard-page/topics-and-skills-dashboard-page.import.ts diff --git a/core/tests/test-modules-mappings/acceptance/logged-out-user/visit-classroom-index-page.txt b/core/tests/test-modules-mappings/acceptance/logged-out-user/visit-classroom-index-page.txt new file mode 100644 index 000000000000..6eef64ac67a6 --- /dev/null +++ b/core/tests/test-modules-mappings/acceptance/logged-out-user/visit-classroom-index-page.txt @@ -0,0 +1 @@ +core/templates/pages/classrooms-page/classrooms-page.module.ts diff --git a/core/tests/wdio.conf.js b/core/tests/wdio.conf.js index 29c8081391dd..20187eac69f8 100644 --- a/core/tests/wdio.conf.js +++ b/core/tests/wdio.conf.js @@ -65,10 +65,6 @@ var suites = { './core/tests/webdriverio_desktop/classroomPage.js' ], - classroomPageFileUploadFeatures: [ - './core/tests/webdriverio_desktop/classroomPageFileUploadFeatures.js' - ], - collections: [ './core/tests/webdriverio_desktop/collections.js' ], diff --git a/core/tests/webdriverio_desktop/classroomPageFileUploadFeatures.js b/core/tests/webdriverio_desktop/classroomPageFileUploadFeatures.js deleted file mode 100644 index dfa773f18ff0..000000000000 --- a/core/tests/webdriverio_desktop/classroomPageFileUploadFeatures.js +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright 2022 The Oppia Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS-IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -/** - * @fileoverview End-to-end tests for file upload features in the classroom - * page. - */ - -var general = require('../webdriverio_utils/general.js'); -var users = require('../webdriverio_utils/users.js'); -var waitFor = require('../webdriverio_utils/waitFor.js'); -var workflow = require('../webdriverio_utils/workflow.js'); - -var ClassroomPage = require('../webdriverio_utils/ClassroomPage.js'); -var DiagnosticTestPage = require('../webdriverio_utils/DiagnosticTestPage.js'); -var SkillEditorPage = require('../webdriverio_utils/SkillEditorPage.js'); -var LibraryPage = require('../webdriverio_utils/LibraryPage.js'); -var TopicsAndSkillsDashboardPage = require('../webdriverio_utils/TopicsAndSkillsDashboardPage.js'); -var TopicEditorPage = require('../webdriverio_utils/TopicEditorPage.js'); - -describe('Classroom page functionality', function () { - var classroomPage = null; - var topicsAndSkillsDashboardPage = null; - var topicEditorPage = null; - var skillEditorPage = null; - - beforeAll(async function () { - classroomPage = new ClassroomPage.ClassroomPage(); - diagnosticTestPage = new DiagnosticTestPage.DiagnosticTestPage(); - libraryPage = new LibraryPage.LibraryPage(); - skillEditorPage = new SkillEditorPage.SkillEditorPage(); - topicsAndSkillsDashboardPage = - new TopicsAndSkillsDashboardPage.TopicsAndSkillsDashboardPage(); - topicEditorPage = new TopicEditorPage.TopicEditorPage(); - - await users.createAndLoginCurriculumAdminUser( - 'creator@classroomPage.com', - 'creatorClassroomPage' - ); - }); - - afterAll(async function () { - await users.logout(); - }); - - it('should add a new published topic to the Math classroom', async function () { - var handle = await browser.getWindowHandle(); - await topicsAndSkillsDashboardPage.get(); - await topicsAndSkillsDashboardPage.createTopic( - 'Topic 1', - 'topic-one', - 'Description', - false - ); - await topicEditorPage.submitTopicThumbnail('../data/test2_svg.svg', true); - await topicEditorPage.updateMetaTagContent('topic meta tag'); - await topicEditorPage.updatePageTitleFragment('topic page title'); - await topicEditorPage.saveTopic('Added thumbnail.'); - await general.closeCurrentTabAndSwitchTo(handle); - - await browser.url('/classroom-admin/'); - await waitFor.pageToFullyLoad(); - await diagnosticTestPage.createNewClassroomConfig('Math', 'math'); - await diagnosticTestPage.addTopicToClassroomConfig('Topic 1'); - await diagnosticTestPage.publishClassroom(); - await classroomPage.get('math'); - // Even if the topic is unpublished, an unclickable tile is shown - // currently. - await classroomPage.expectNumberOfTopicsToBe(1); - await topicsAndSkillsDashboardPage.get(); - await topicsAndSkillsDashboardPage.createSkillWithDescriptionAndExplanation( - 'Skill 1', - 'Concept card explanation', - false - ); - await skillEditorPage.addRubricExplanationForDifficulty( - 'Easy', - 'Second explanation for easy difficulty.' - ); - await skillEditorPage.saveOrPublishSkill('Edited rubrics'); - // A minimum of three questions are required for skill to get assigned in - // a topic’s diagnostic test. - await workflow.createQuestion(); - await workflow.createQuestion(); - await workflow.createQuestion(); - - await topicsAndSkillsDashboardPage.get(); - await topicsAndSkillsDashboardPage.navigateToSkillsTab(); - await topicsAndSkillsDashboardPage.assignSkillToTopic('Skill 1', 'Topic 1'); - await topicsAndSkillsDashboardPage.get(); - await topicsAndSkillsDashboardPage.navigateToTopicWithIndex(0); - - await topicEditorPage.addDiagnosticTestSkill('Skill 1'); - - await topicEditorPage.addSubtopic( - 'Subtopic 1', - 'subtopic-one', - '../data/test2_svg.svg', - 'Subtopic content' - ); - await topicEditorPage.saveTopic('Added subtopic.'); - - await topicEditorPage.navigateToTopicEditorTab(); - await topicEditorPage.replacementDragSkillToSubtopic(0); - await topicEditorPage.saveTopic('Added skill to subtopic.'); - - await topicEditorPage.publishTopic(); - await classroomPage.get('math'); - await classroomPage.expectNumberOfTopicsToBe(1); - }); - - afterEach(async function () { - await general.checkForConsoleErrors([]); - }); -}); diff --git a/core/tests/webdriverio_utils/DiagnosticTestPage.js b/core/tests/webdriverio_utils/DiagnosticTestPage.js index 59f469894b40..aa053711ee7d 100644 --- a/core/tests/webdriverio_utils/DiagnosticTestPage.js +++ b/core/tests/webdriverio_utils/DiagnosticTestPage.js @@ -212,7 +212,7 @@ var DiagnosticTestPage = function () { var addTopicToClassroom = async function (topicName) { var containerLocator = '.e2e-test-classroom-category-dropdown'; - var searchTopicInput = $('.e2e-test-exploration-new-category-add').$( + var searchTopicInput = $('.e2e-test-classroom-new-topic-add').$( '.mat-select-search-input.mat-input-element' ); var searchInputLocatorTextOption = $( diff --git a/scripts/common.py b/scripts/common.py index 36b93a6b6904..fd7779bbcae2 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -217,6 +217,7 @@ 'blog-editor/create-and-publish-a-blog-post-with-required-details', 'blog-editor/try-to-publish-a-duplicate-blog-post-and-get-blocked', 'curriculum-admin/create-publish-unpublish-and-delete-topic-and-skill', + 'curriculum-admin/create-edit-and-delete-classroom', 'exploration-editor/create-exploration-and-change-basic-settings', 'exploration-editor/modify-translations-through-modal', 'exploration-editor/load-complete-and-restart-exploration-preview', @@ -240,6 +241,7 @@ 'logged-out-user/click-all-links-on-privacy-policy-page', 'logged-out-user/click-all-links-on-terms-page', 'logged-out-user/click-all-buttons-on-donate-page', + 'logged-out-user/visit-classroom-index-page', 'moderator/edit-featured-activities-list', 'moderator/view-recent-commits-and-feedback-messages', 'practice-question-admin/add-and-remove-contribution-rights',