Skip to content

Commit

Permalink
Merge branch 'main' into N21-2167-preferred-tools-for-boards
Browse files Browse the repository at this point in the history 
# Conflicts:
#	cypress/e2e/course/contextRestrictionOfCtlTools.feature
  • Loading branch information
@MBergCap
MBergCap committed Oct 16, 2024
2 parents d2b50a5 + b06c24e commit be7727c
Show file tree
Hide file tree
Showing 30 changed files with 485 additions and 488 deletions.
2 changes: 1 addition & 1 deletion cypress/e2e/class_management/createEditDeleteClassOnDBCAndBRB.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Feature: Class Management - To create, edit and delete class on dBC or on BRB
@staging_test
Examples:
| namespace | teacher | student | school_year | custom_class_name | edit_custom_class_name | number_of_students | fullname_teacher | fullname_student |
| dbc | teacher1_dbc | student1_dbc | 2023/24 | cyTestClassName | cyEditClassName | 1 | Karl Herzog | Herbert Kraft |
| brb | teacher1_brb | student1_brb | 2023/24 | cyTestClassName | cyEditClassName | 1 | Karl Herzog | Herbert Kraft |

@school_api_test
Examples:
Expand Down
30 changes: 15 additions & 15 deletions cypress/e2e/course/addBBBToolToCourse.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ Feature: Course - Teacher can add and remove BBB tool in the course with admin p
Given I am logged in as a '<admin>' at '<namespace>'

# Pre-condition: admin creates a course and assign teacher to the course
When I go to rooms overview
When I click on FAB to create a new room depending on sub menu
When I go to courses overview
When I click on FAB to create a new course depending on sub menu
Then I see section one area on the course create page
When I enter the course title '<course_name>'
When I select room colour as red
When I select course colour as red
Then I select teacher '<fullname_teacher>' is selected by default
Then I see substitute teacher selection box
Then I see date pickers to start and end the course as per school year
Then I see button to create a course time table container
When I click on button Next Steps after entering the room detail in section one
When I click on button Next Steps after entering the course detail in section one
Then I see section two area on the course create page
Then I see class selection box to select the class for the room
Then I see student selection box to select the student for the room
Then I see class selection box to select the class for the course
Then I see student selection box to select the student for the course
# Note: student user is not needed in this feature so this step is commented out
#When I select the student 'cypress student_1' in the list
When I click on button Next Steps after selecting room participant details
When I click on button Next Steps after selecting course participant details
Then I see the section three as the finish page
When I click on button To Course Overview on the finish page
# Note: this step is not applicable for the admin user
#Then I see the course 'CypressAut Test Creation and Deletion' on the room overview page
#Then I see the course 'CypressAut Test Creation and Deletion' on the course overview page

# Admin enables the video conference in the school settings page
Given I am logged in as a '<admin>' at '<namespace>'
Expand All @@ -44,8 +44,8 @@ Feature: Course - Teacher can add and remove BBB tool in the course with admin p

# Teacher can add and remove BBB tool in the course
Given I am logged in as a '<teacher>' at '<namespace>'
When I go to rooms overview
When I go to room '<course_name>'
When I go to courses overview
When I go to course '<course_name>'
When I open page Edit course
Then I see page Edit course
When I click on checkbox Activate video conferences in page Edit course to enable the BBB tool
Expand Down Expand Up @@ -73,20 +73,20 @@ Feature: Course - Teacher can add and remove BBB tool in the course with admin p

# Teacher can not add BBB tool in the course
Given I am logged in as a '<teacher>' at '<namespace>'
When I go to rooms overview
When I go to room '<course_name>'
When I go to courses overview
When I go to course '<course_name>'
When I open page Edit course
Then I see page Edit course
Then I see the disabled check box for Activating video conferences in page Edit course

# Post-condition: Teacher deletes the course
When I go to rooms overview
When I go to room '<course_name>'
When I go to courses overview
When I go to course '<course_name>'
When I open page Edit course
When I click on the button delete course
Then I see the modal to confirm the deletion
When I click on the button delete on the modal to confirm the course deletion
Then I do not see the course '<course_name>' on the room overview page
Then I do not see the course '<course_name>' on the course overview page

@staging_test
Examples:
Expand Down
34 changes: 17 additions & 17 deletions cypress/e2e/course/addEditDeleteCtlToolInCourse.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ Feature: Course - To add, edit and delete a ctl tool in a course
@unstable_test
Scenario: Pre-test: Admin creates a course and adds external tools to school
Given I am logged in as a 'admin1_nbc' at 'nbc'
When I go to rooms overview
When I go to courses overview

# Admin creates a course
When I click on FAB to create a new room depending on sub menu
When I click on FAB to create a new course depending on sub menu
Then I see section one area on the course create page
When I enter the course title 'Cypress Test Course'
When I select 'Karl Herzog' from field teacher
When I click on button Next Steps after entering the room detail in section one
When I click on button Next Steps after entering the course detail in section one
Then I see section two area on the course create page
When I select 'Amelia Strobl' from field student
When I click on button Next Steps after selecting room participant details
When I click on button Next Steps after selecting course participant details
Then I see the section three area as the finish page
When I click on button To Course Overview on the finish page

Expand Down Expand Up @@ -56,9 +56,9 @@ Feature: Course - To add, edit and delete a ctl tool in a course
@unstable_test
Scenario: Teacher adds, edits and deletes tools in a course, Student sees course tools but does not see the button to add a tool
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course'
Then I see room page 'Cypress Test Course'
When I go to courses overview
When I go to course 'Cypress Test Course'
Then I see course page 'Cypress Test Course'
When I click on the tools tab
Then I see the button to add a tool
# Teacher adds a tool without a custom parameter
Expand Down Expand Up @@ -125,17 +125,17 @@ Feature: Course - To add, edit and delete a ctl tool in a course
When I enter 'updated test' in optional custom parameter field 'contextParam'
Then I see custom parameter input field 'contextParam' contains 'updated test'
When I confirm the update
Then I see room page 'Cypress Test Course'
Then I see course page 'Cypress Test Course'
When I click on three dot menu of the tool 'CY Test Tool Optional Parameters'
When I click on the tool edit button of 'CY Test Tool Optional Parameters'
Then I see the tool configuration page title
Then I see custom parameter input field 'contextParam' contains 'updated test'

# Student sees course tools but does not see the button to add a tool
Given I am logged in as a 'student2_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course'
Then I see room page 'Cypress Test Course'
When I go to courses overview
When I go to course 'Cypress Test Course'
Then I see course page 'Cypress Test Course'
When I click on the tools tab
Then I do not see the button to add a tool
Then I see 5 tools
Expand All @@ -146,9 +146,9 @@ Feature: Course - To add, edit and delete a ctl tool in a course

# Teacher deletes tools from a course
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course'
Then I see room page 'Cypress Test Course'
When I go to courses overview
When I go to course 'Cypress Test Course'
Then I see course page 'Cypress Test Course'
When I click on the tools tab
Then I see 5 tools
When I click on three dot menu of the tool 'CY Test Tool Optional Parameters'
Expand All @@ -161,13 +161,13 @@ Feature: Course - To add, edit and delete a ctl tool in a course
@unstable_test
Scenario: Post-test: Teacher deletes course, admin deletes external tools
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course'
When I go to courses overview
When I go to course 'Cypress Test Course'
When I open page Edit course
When I click on the button delete course
Then I see the modal to confirm the deletion
When I click on the button delete on the modal to confirm the course deletion
Then I do not see the course 'Cypress Test Course' on the room overview page
Then I do not see the course 'Cypress Test Course' on the course overview page

# Admin deletes external tools
Given I am logged in as a 'admin1_nbc' at 'nbc'
Expand Down
24 changes: 12 additions & 12 deletions cypress/e2e/course/addSubstituteTeacherToCourse.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,42 @@ Feature: Course - Add substitute teacher to course
Given I am logged in as a '<admin>' at '<namespace>'

# pre-condition: admin creates a course and assign teacher to the course
When I go to rooms overview
When I click on FAB to create a new room depending on sub menu
When I go to courses overview
When I click on FAB to create a new course depending on sub menu
Then I see section one area on the course create page
When I enter the course title '<course_name>'
When I select room colour as red
When I select course colour as red
Then I select '<fullname_teacher>' from field teacher
Then I see substitute teacher selection box
Then I see button to create a course time table container
When I click on button Next Steps after entering the room detail in section one
When I click on button Next Steps after entering the course detail in section one
Then I see section two area on the course create page
When I click on button Next Steps after selecting room participant details
When I click on button Next Steps after selecting course participant details
Then I see the section three area as the finish page
When I click on button To Course Overview on the finish page

# adding substitute teacher to course
Given I am logged in as a '<teacher1>' at '<namespace>'
When I go to rooms overview
When I go to room '<course_name>'
When I go to courses overview
When I go to course '<course_name>'
When I open page Edit course
Then I see page Edit course
And I clear substitute teacher field
And I add substitute teacher '<substitute_teacher>'
When I click on button Save changes in page Edit course
Given I am logged in as a '<teacher2>' at '<namespace>'
When I go to rooms overview
When I go to room '<course_name>'
When I go to courses overview
When I go to course '<course_name>'

# Post-condition: Teacher deletes the course
Given I am logged in as a '<teacher1>' at '<namespace>'
When I go to rooms overview
When I go to room '<course_name>'
When I go to courses overview
When I go to course '<course_name>'
When I open page Edit course
When I click on the button delete course
Then I see the modal to confirm the deletion
When I click on the button delete on the modal to confirm the course deletion
Then I do not see the course '<course_name>' on the room overview page
Then I do not see the course '<course_name>' on the course overview page

@school_api_test
Examples:
Expand Down
18 changes: 9 additions & 9 deletions cypress/e2e/course/contextRestrictionOfCtlTools.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ Feature: Course - Restrict CTL tools to context course, board-element, media-boa
@unstable_test
Scenario: Admin creates a course and adds external tools to school
Given I am logged in as a 'admin1_nbc' at 'nbc'
When I go to rooms overview
When I go to courses overview
# Pre-Test: Admin creates a course
When I click on FAB to create a new room depending on sub menu
When I click on FAB to create a new course depending on sub menu
Then I see section one area on the course create page
When I enter the course title 'Cypress Test Course'
When I select 'Karl Herzog' from field teacher
When I click on button Next Steps after entering the room detail in section one
When I click on button Next Steps after entering the course detail in section one
Then I see section two area on the course create page
When I click on button Next Steps after selecting room participant details
When I click on button Next Steps after selecting course participant details
Then I see the section three area as the finish page
When I click on button To Course Overview on the finish page
# Admin adds tools
Expand Down Expand Up @@ -60,9 +60,9 @@ Feature: Course - Restrict CTL tools to context course, board-element, media-boa
@unstable_test
Scenario: Teacher adds ctl tools to context course, board-element and media-board
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course'
Then I see room page 'Cypress Test Course'
When I go to courses overview
When I go to course 'Cypress Test Course'
Then I see course page 'Cypress Test Course'
When I click on the tools tab
Then I see the button to add a tool
When I click on the button to add a tool
Expand Down Expand Up @@ -95,8 +95,8 @@ Feature: Course - Restrict CTL tools to context course, board-element, media-boa
Then I see the tool 'CY Test Tool 1' in the tool overview

# Teacher adds ctl tools with context restriction board-element to a board
When I go to rooms overview
When I go to room 'Cypress Test Course'
When I go to courses overview
When I go to course 'Cypress Test Course'
When I go to the tab contents in course detail page
When I click on FAB to create new content
When I click on the button FAB New Column Board
Expand Down
48 changes: 24 additions & 24 deletions cypress/e2e/course/copyCtlTools.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ Feature: Course - Copy CTL tools

# Teacher creates a course and adds tools to the course
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I click on FAB to create a new room depending on sub menu
When I go to courses overview
When I click on FAB to create a new course depending on sub menu
When I enter the course title 'Cypress Test Course Copy'
Then I see teacher 'Karl Herzog' is selected by default
When I click on button Next Steps after entering the room detail in section one
When I click on button Next Steps after selecting room participant details
When I click on button Next Steps after entering the course detail in section one
When I click on button Next Steps after selecting course participant details
Then I see the section three area as the finish page
When I click on button To Course Overview on the finish page
Then I see the course 'Cypress Test Course Copy' on the room overview page
When I go to room 'Cypress Test Course Copy'
Then I see room page 'Cypress Test Course Copy'
Then I see the course 'Cypress Test Course Copy' on the course overview page
When I go to course 'Cypress Test Course Copy'
Then I see course page 'Cypress Test Course Copy'
When I click on the tools tab
Then I see the button to add a tool
# Teacher adds a tool with required parameter
Expand Down Expand Up @@ -67,13 +67,13 @@ Feature: Course - Copy CTL tools
@unstable_test
Scenario: Teacher copies the course, student sees copied ctl tools and tries to launch a incomplete tool
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course Copy'
Then I see room page 'Cypress Test Course Copy'
When I go to courses overview
When I go to course 'Cypress Test Course Copy'
Then I see course page 'Cypress Test Course Copy'
When I click on copy course button
Then I see the copy result notification
When I close the dialog
Then I see room page 'Cypress Test Course Copy (1)'
Then I see course page 'Cypress Test Course Copy (1)'
# Teacher adds a student to newly copied course
When I open page Edit course
Then I see page Edit course
Expand All @@ -94,9 +94,9 @@ Feature: Course - Copy CTL tools

# Student sees copied ctl tools and incomplete tool cannot be launched
Given I am logged in as a 'student2_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course Copy (1)'
Then I see room page 'Cypress Test Course Copy (1)'
When I go to courses overview
When I go to course 'Cypress Test Course Copy (1)'
Then I see course page 'Cypress Test Course Copy (1)'
When I click on the tools tab
Then I see 3 tools
Then I see the tool 'CY Test Tool Context Scope' in the tool overview
Expand All @@ -111,9 +111,9 @@ Feature: Course - Copy CTL tools

# Teacher fixes the incomplete tools
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course Copy (1)'
Then I see room page 'Cypress Test Course Copy (1)'
When I go to courses overview
When I go to course 'Cypress Test Course Copy (1)'
Then I see course page 'Cypress Test Course Copy (1)'
When I click on the tools tab
When I click on three dot menu of the tool 'CY Test Tool Protected Parameter'
When I click on the tool edit button of 'CY Test Tool Protected Parameter'
Expand All @@ -125,27 +125,27 @@ Feature: Course - Copy CTL tools
Then I see the tool configuration page title
When I enter 'protected' in optional custom parameter field 'protected'
When I confirm the update
Then I see room page 'Cypress Test Course Copy (1)'
Then I see course page 'Cypress Test Course Copy (1)'
Then I see the tool 'CY Test Tool Context Scope' is not marked as incomplete
Then I see the tool 'CY Test Tool Optional Protected Parameter' is not marked as incomplete operational

@unstable_test
Scenario: Post-test: Teacher deletes courses, admin deletes external tools
Given I am logged in as a 'teacher1_nbc' at 'nbc'
When I go to rooms overview
When I go to room 'Cypress Test Course Copy'
When I go to courses overview
When I go to course 'Cypress Test Course Copy'
When I open page Edit course
When I click on the button delete course
Then I see the modal to confirm the deletion
When I click on the button delete on the modal to confirm the course deletion
Then I do not see the course 'Cypress Test Course Copy' on the room overview page
When I go to rooms overview
When I go to room 'Cypress Test Course Copy (1)'
Then I do not see the course 'Cypress Test Course Copy' on the course overview page
When I go to courses overview
When I go to course 'Cypress Test Course Copy (1)'
When I open page Edit course
When I click on the button delete course
Then I see the modal to confirm the deletion
When I click on the button delete on the modal to confirm the course deletion
Then I do not see the course 'Cypress Test Course Copy (1)' on the room overview page
Then I do not see the course 'Cypress Test Course Copy (1)' on the course overview page

# Admin deletes external tools
Given I am logged in as a 'admin1_nbc' at 'nbc'
Expand Down
Loading

0 comments on commit be7727c

Please sign in to comment.