mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 16:32:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MOODLE_401_STABLE' into install_401_STABLE

Browse Source
This commit is contained in:
AMOS bot 2024-03-14 00:13:07 +00:00
commit a700d119df
9 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/bigbluebuttonbn/tests/behat/add_instance.feature
View File

@ -31,7 +31,7 @@ Feature: bigbluebuttonbn instance
Scenario: Add a mod_bigbluebuttonbn instance with Recordings only
When I am on the "BBB Instance name 3" "bigbluebuttonbn activity" page
And I should not see "This room is ready. You can join the session now."
Then I should not see "This room is ready. You can join the session now."
And I should not see "Join session"
And I should see "Recordings"

12
mod/bigbluebuttonbn/tests/behat/completion.feature
View File

@ -18,14 +18,14 @@ Feature: As a user I can complete a BigblueButtonBN activity by usual or custom
Scenario: I set the completion to standard type of completion.
Given I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin
And I click on "Settings" "link"
When I click on "Settings" "link"
And I expand all fieldsets
And I set the following fields to these values:
| Completion tracking | Show activity as complete when conditions are met |
| Require view | 1 |
And I press "Save and display"
And I log out
Given I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as traverst
And I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as traverst
Then I should see "Done: View"
@javascript
@ -33,7 +33,7 @@ Feature: As a user I can complete a BigblueButtonBN activity by usual or custom
Given a BigBlueButton mock server is configured
And the following config values are set as admin:
| bigbluebuttonbn_meetingevents_enabled | 1 |
When I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin
And I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin
And I click on "Settings" "link"
And I expand all fieldsets
And I set the following fields to these values:
@ -44,11 +44,11 @@ Feature: As a user I can complete a BigblueButtonBN activity by usual or custom
And the following "mod_bigbluebuttonbn > meeting" exists:
| activity | RoomRecordings |
And I log out
Given I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as traverst
And I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as traverst
When I click on "Join session" "link"
And I switch to "bigbluebutton_conference" window
And I wait until the page is ready
Then I follow "End Meeting"
And I follow "End Meeting"
And the BigBlueButtonBN server has received the following events from user "traverst":
| instancename | eventtype | eventdata |
| RoomRecordings | chats | 1 |
@ -57,7 +57,7 @@ Feature: As a user I can complete a BigblueButtonBN activity by usual or custom
# is closed before.
And I close all opened windows
And I switch to the main window
Given the BigBlueButtonBN activity "RoomRecordings" has sent recording all its events
And the BigBlueButtonBN activity "RoomRecordings" has sent recording all its events
And I run all adhoc tasks
And I reload the page
Then I should see "Done: Participate in 1 chat(s)"

35
mod/bigbluebuttonbn/tests/behat/guest_access.feature
View File

@ -18,29 +18,32 @@ Feature: Guest access allows external users to connect to a meeting
| bigbluebuttonbn_guestaccess_enabled | <guestaccess> |
When I am on the "RoomRecordings" "bigbluebuttonbn activity editing" page logged in as "admin"
Then I <result> "Guest access"
Then I log out
And I log out
Examples:
| guestaccess | result |
| 1 | should see |
| 0 | should not see |
@javascript
Scenario: I should see Guest settings on the module form
Scenario Outline: I should see Guest settings on the module form
Given the following config values are set as admin:
| bigbluebuttonbn_guestaccess_enabled | 1 |
When I am on the "RoomRecordings" "bigbluebuttonbn activity editing" page logged in as "admin"
Then I should see "Guest access"
Then I click on "Expand all" "link"
Then I should see "Allow guest access"
And I should not see "Meeting link"
And I should not see "Meeting password"
When I set the field "Allow guest access" to "1"
Then I should see "Guests joining must be admitted by a moderator"
And I should see "Meeting link"
And I should see "Meeting password"
And I should see "Copy link"
And I should see "Copy password"
Then I log out
And I should see "Guest access"
And I click on "Expand all" "link" in the "region-main" "region"
And I should see "Allow guest access"
And I set the field "Allow guest access" to <guestaccess>
Then I <result> "Guests joining must be admitted by a moderator"
And I <seelink> "Meeting link"
And I <seepassword> "Meeting password"
And I <seecopylink> "Copy link"
And I <seecopypw> "Copy password"
And I log out
Examples:
| guestaccess | result | seelink | seepassword | seecopylink | seecopypw |
| "1" | should see | should see | should see | should see | should see |
| "0" | should not see | should not see | should not see | should not see | should not see |
@javascript
Scenario: I should be able to use the guest link and see the popup dialog
@ -67,12 +70,12 @@ Feature: Guest access allows external users to connect to a meeting
Scenario: I should be able to invite guest to the meeting
Given the following config values are set as admin:
| bigbluebuttonbn_guestaccess_enabled | 1 |
And I am on the "RoomRecordingsWithGuest" "bigbluebuttonbn activity" page logged in as "admin"
When I am on the "RoomRecordingsWithGuest" "bigbluebuttonbn activity" page logged in as "admin"
And I click on "Add guests" "button"
And I set the field "Guest emails" to "testuser@email.com"
And I click on "OK" "button" in the "Add guests to this meeting" "dialogue"
Then I should see "An invitation will be sent to testuser@email.com."
Then I log out
And I log out
Scenario: I should be able to invite guest to the meeting even if forcelogin is set
Given the following config values are set as admin:

16
mod/bigbluebuttonbn/tests/behat/join_meeting.feature
View File

@ -7,7 +7,7 @@ Feature: Test the ability to run the full meeting lifecycle (start to end)
And I accept dpa and enable bigbluebuttonbn plugin
And the following config values are set as admin:
| bigbluebuttonbn_userlimit_editable | 1 |
Given the following course exists:
And the following course exists:
| name | Test course |
| shortname | C1 |
And the following "users" exist:
@ -32,8 +32,8 @@ Feature: Test the ability to run the full meeting lifecycle (start to end)
Scenario: Users should be able to join a meeting then end the meeting for themselves and
return to the meeting page to join again.
When I am on the "Room recordings" Activity page logged in as traverst
Then "Join session" "link" should exist
When I click on "Join session" "link"
And "Join session" "link" should exist
And I click on "Join session" "link"
And I switch to "bigbluebutton_conference" window
And I click on "End Meeting" "link"
# Selenium driver does not like the click action to be done before we
@ -51,15 +51,15 @@ Feature: Test the ability to run the full meeting lifecycle (start to end)
And I click on "Join session" "link"
And I switch to the main window
And I log out
Then I am on the "Room recordings" Activity page logged in as uraverst
And I am on the "Room recordings" Activity page logged in as uraverst
And "Join session" "link" should exist
And I click on "Join session" "link"
And I switch to the main window
And I log out
Then I am on the "Room recordings" Activity page logged in as vraverst
Then "Join session" "link" should not exist
And I am on the "Room recordings" Activity page logged in as vraverst
And "Join session" "link" should not exist
And I should see "The limit of how many users allowed in a session has been reached"
And I log out
Then I am on the "Room recordings" Activity page logged in as admin
Then "Join session" "link" should not exist
And I am on the "Room recordings" Activity page logged in as admin
And "Join session" "link" should not exist
And I should see "The limit of how many users allowed in a session has been reached"

18
mod/bigbluebuttonbn/tests/behat/join_meeting_as_guest.feature
View File

@ -32,22 +32,22 @@ Feature: Test the ability to run the full meeting lifecycle (start to end) for g
Scenario: Teacher users should be able to see the guest user information
When I am on the "Room recordings" Activity page logged in as teacher
Then I should see "Add guests"
When I click on "Add guests" "button"
Then I should see "Add guests to this meeting" in the ".modal-dialog" "css_element"
And I should see "Add guests"
Then I click on "Add guests" "button"
And I should see "Add guests to this meeting" in the ".modal-dialog" "css_element"
Scenario: Guest users should be able to join a meeting as guest when the meeting is running.
When I am on the "Room recordings" Activity page logged in as traverst
Then "Join session" "link" should exist
When I click on "Join session" "link"
And "Join session" "link" should exist
And I click on "Join session" "link"
And I switch to the main window
Then I log out
And I log out
And I close all opened windows
Then I am on the "Room recordings" "mod_bigbluebuttonbn > BigblueButtonBN Guest" page
And I am on the "Room recordings" "mod_bigbluebuttonbn > BigblueButtonBN Guest" page
Then I should see "Guest username"
And I should see "Password"
And I set the field "username" to "Test Guest User"
And I click on "Join meeting" "button"
Then I should see "Test Guest User"
And I should see "Test Guest User"
And I click on "Leave Meeting" "link"
Then I should see "C1: Room recordings"
And I should see "C1: Room recordings"

2
mod/bigbluebuttonbn/tests/behat/lock_settings.feature
View File

@ -60,4 +60,4 @@ Feature: Test that the meeting has the right lock setting.
And I click on "Join session" "link"
And I switch to "bigbluebutton_conference" window
Then I should see "disableCam : enabled" in the "lockSettings" "mod_bigbluebuttonbn > Meeting field"
Then I should see "lockOnJoin : enabled" in the "lockSettings" "mod_bigbluebuttonbn > Meeting field"
And I should see "lockOnJoin : enabled" in the "lockSettings" "mod_bigbluebuttonbn > Meeting field"

12
mod/bigbluebuttonbn/tests/behat/recordings_import.feature
View File

@ -74,7 +74,7 @@ Feature: Manage and list recordings
And I click on "OK" "button" in the "Confirm" "dialogue"
# There is no confirmation dialog when deleting an imported record.
And I wait until the page is ready
Then I should not see "Recording 1"
But I should not see "Recording 1"
And I click on "Import recording links" "button"
And I select "Test Course 1 (C1)" from the "sourcecourseid" singleselect
And I select "RoomRecordings" from the "sourcebn" singleselect
@ -88,31 +88,31 @@ Feature: Manage and list recordings
And I delete "RoomRecordings" activity
# The activity is deleted asynchroneously.
And I run all adhoc tasks
Then I am on the "RoomRecordings1" "bigbluebuttonbn activity" page logged in as "admin"
And I am on the "RoomRecordings1" "bigbluebuttonbn activity" page logged in as "admin"
And I click on "Import recording links" "button"
And I select "Recordings from deleted activities" from the "sourcecourseid" singleselect
Then I should see "Recording 1"
And I should see "Recording 2"
# add the first recording
Then I click on "a.action-icon" "css_element" in the "Recording 1" "table_row"
And I click on "a.action-icon" "css_element" in the "Recording 1" "table_row"
# add the second recording
And I click on "a.action-icon" "css_element" in the "Recording 2" "table_row"
And I wait until the page is ready
And I click on "Go back" "button"
# This should be refactored with the right classes for the table element
# We use javascript here to create the table so we don't get the same structure.
Then "Recording 1" "table_row" should exist
And "Recording 1" "table_row" should exist
And I click on "a[data-action='delete']" "css_element" in the "Recording 1" "table_row"
And I click on "OK" "button" in the "Confirm" "dialogue"
# There is no confirmation dialog when deleting an imported record.
And I wait until the page is ready
Then I should not see "Recording 1"
But I should not see "Recording 1"
# Change window size to large to avoid the "Import recording links" button being hidden (random failure).
And I change window size to "large"
And I click on "Import recording links" "button"
And I select "Recordings from deleted activities" from the "sourcecourseid" singleselect
And I should see "Recording 1"
And I should not see "Recording 2"
But I should not see "Recording 2"
Scenario: I check that when I disable Import recording feature the import recording link button should not be shown
Given I log in as "admin"

14
mod/bigbluebuttonbn/tests/behat/room.feature
View File

@ -25,11 +25,11 @@ Feature: The recording can be managed through the room page and as a user I can
@javascript
Scenario: Recording should be sortable by date
Given I am on the "RoomRecordings" "bigbluebuttonbn activity" page logged in as admin
Then I click on "th[data-yui3-col-id='date'] .yui3-datatable-sort-indicator" "css_element"
Then "Recording 1" "text" should appear before "Recording 3" "text"
Then "Recording 3" "text" should appear before "Recording 2" "text"
Then "Recording 2" "text" should appear before "Recording 4" "text"
Then I click on "th[data-yui3-col-id='date'] .yui3-datatable-sort-indicator" "css_element"
When I click on "th[data-yui3-col-id='date'] .yui3-datatable-sort-indicator" "css_element"
And "Recording 1" "text" should appear before "Recording 3" "text"
And "Recording 3" "text" should appear before "Recording 2" "text"
And "Recording 2" "text" should appear before "Recording 4" "text"
And I click on "th[data-yui3-col-id='date'] .yui3-datatable-sort-indicator" "css_element"
Then "Recording 1" "text" should appear after "Recording 3" "text"
Then "Recording 3" "text" should appear after "Recording 2" "text"
Then "Recording 2" "text" should appear after "Recording 4" "text"
And "Recording 3" "text" should appear after "Recording 2" "text"
And "Recording 2" "text" should appear after "Recording 4" "text"

4
version.php
View File

@ -29,9 +29,9 @@
defined('MOODLE_INTERNAL') || die();
$version = 2022112809.05; // 20221128 = branching date YYYYMMDD - do not modify!
$version = 2022112809.06; // 20221128 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.1.9+ (Build: 20240308)'; // Human-friendly version name
$release = '4.1.9+ (Build: 20240313)'; // Human-friendly version name
$branch = '401'; // This version's branch.
$maturity = MATURITY_STABLE; // This version's maturity level.