mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-82669-404' of https://github.com/paulholden/moodle into MOODLE_404_STABLE

Browse Source
This commit is contained in:
Huong Nguyen 2024-08-08 08:58:43 +07:00
commit 850b4a5f56
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
8 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/tool/licensemanager/tests/behat/delete_license.feature
View File

@ -37,8 +37,8 @@ Feature: Delete custom licenses
| Licence version | ##1 March 2019## |
And I press "Save changes"
And I follow "Private files" in the user menu
And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager
And I click on "moodle-logo.png" "link"
And I upload "lib/tests/fixtures/gd-logo.png" file to "Files" filemanager
And I click on "gd-logo.png" "link"
And I set the field "Choose licence" to "Test licence"
And I press "Update"
And I press "Save changes"

1
customfield/tests/behat/edit_fields_settings.feature
View File

@ -1,4 +1,3 @@
# This feature has Atto-specific steps. See MDL-75913 for further details.
@core @core_course @core_customfield @javascript
Feature: Teachers can edit course custom fields
In order to have additional data on the course

32
filter/displayh5p/tests/behat/inline_editing_content.feature
View File

@ -1,4 +1,4 @@
@editor @editor_atto @atto @atto_h5p @filter @filter_displayh5p @core_h5p @_switch_iframe
@editor @filter @filter_displayh5p @core_h5p @_switch_iframe
Feature: Inline editing H5P content anywhere
In order to edit an existing H5P content
As a user
@ -42,13 +42,13 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page logged in as "teacher1"
And I navigate to "Settings" in current page administration
And I click on "Insert H5P" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Private files" repository in file picker
And I click on "greeting-card.h5p" "file" in repository content area
And I click on "Link to the file" "radio"
And I click on "Select this file" "button"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I click on "Save and display" "button"
And I switch to "h5p-iframe" class iframe
And I switch to "h5p-iframe" class iframe
@ -86,13 +86,13 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page
And I navigate to "Settings" in current page administration
And I click on "Insert H5P" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
And I click on "Link to the file" "radio"
And I click on "Select this file" "button"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I click on "Save and display" "button"
And I switch to "h5p-iframe" class iframe
And I switch to "h5p-iframe" class iframe
@ -130,13 +130,13 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page
And I navigate to "Settings" in current page administration
And I click on "Insert H5P" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
And I click on "Make a copy of the file" "radio"
And I click on "Select this file" "button"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I click on "Save and display" "button"
And I switch to "h5p-iframe" class iframe
And I switch to "h5p-iframe" class iframe
@ -176,9 +176,9 @@ Feature: Inline editing H5P content anywhere
# Add H5P content to the page.
And I am on the "PageName1" "page activity" page
And I navigate to "Settings" in current page administration
And I click on "Insert H5P" "button" in the "#fitem_id_page" "css_element"
And I set the field with xpath "//input[@data-region='h5pfile']" to "https://moodle.h5p.com/content/1290772960722742119"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I click on "Configure H5P content" "button" in the "#fitem_id_page" "css_element"
And I set the field "H5P URL or file upload" to "https://moodle.h5p.com/content/1290772960722742119"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I click on "Save and display" "button"
And ".h5p-placeholder" "css_element" should exist
And I switch to "h5pcontent" iframe
@ -219,13 +219,13 @@ Feature: Inline editing H5P content anywhere
| Text block title | H5PTest |
| Content | - |
And I configure the "H5PTest" block
And I click on "Insert H5P" "button" in the "//div[contains(@id,'fitem_id_config_text')]" "xpath_element"
And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
And I click on "Configure H5P content" "button" in the "//div[contains(@id,'fitem_id_config_text')]" "xpath_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
And I click on "Make a copy of the file" "radio"
And I click on "Select this file" "button"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I click on "Save changes" "button" in the "Configure H5PTest block" "dialogue"
And I switch to "h5p-iframe" class iframe
And I switch to "h5p-iframe" class iframe

2
h5p/tests/behat/h5p_overview.feature
View File

@ -23,7 +23,7 @@ Feature: Check H5P tools information is correct
And I should see "Disable" in the "H5P scheduled task" "table_row"
@javascript
Scenario: H5P atto button.
Scenario: H5P editor button.
Given I log in as "admin"
When I navigate to "H5P > H5P overview" in site administration
Then I should see "Enable" in the "Insert H5P button" "table_row"

4
mod/assign/tests/behat/edit_previous_feedback.feature
View File

@ -4,9 +4,7 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
As a teacher
I need to be able to edit the feedback for a students previous submission attempt.
# Atto is necessary to use in this test to circumvent an error in Firefox when using Tiny.
# See issue MDL-77740 for more context, although that implementation does not fix it here.
@javascript @editor_atto
@javascript
Scenario: Edit feedback for a students previous attempt.
Given the following "courses" exist:
| fullname | shortname | category | groupmode |

2
mod/assign/tests/behat/online_submissions.feature
View File

@ -60,8 +60,6 @@ Feature: In an assignment, students can add and edit text online
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
And the following config values are set as admin:
| autosavefrequency | 1 | editor_atto |
And the following "activity" exists:
| activity | assign |
| course | C1 |

8
mod/data/tests/behat/add_entries.feature
View File

@ -66,8 +66,8 @@ Feature: Users can add entries to database activities
And I should see "Student second entry"
And I should see "Student third entry"
@javascript @editor @editor_atto @atto @atto_h5p
Scenario: If a new text area entry is added, the filepicker is displayed in the H5P Atto button
@javascript
Scenario: If a new text area entry is added, the filepicker is displayed in the H5P editor dialogue
Given the following "mod_data > fields" exist:
| database | type | name |
| data1 | textarea | Textarea field name |
@ -81,8 +81,8 @@ Feature: Users can add entries to database activities
And I am on the "Course 1" course page logged in as teacher1
When I click on "Test database name" "link"
And I click on "Add entry" "button"
And I click on "Insert H5P" "button"
Then I should see "Browse repositories..."
And I click on "Configure H5P content" "button"
Then I should see "Browse repositories..." in the "Insert H5P content" "dialogue"
@javascript
Scenario: If maximum number of entries is set other than None then add entries should be seen only if number of entries is less than it

14
mod/forum/tests/behat/h5p_inline_editing_content.feature
View File

@ -1,4 +1,4 @@
@mod @mod_forum @editor @editor_atto @atto @atto_h5p @filter @filter_displayh5p @core_h5p @_file_upload @_switch_iframe
@mod @mod_forum @filter @filter_displayh5p @core_h5p @_file_upload @_switch_iframe
Feature: Inline editing H5P content in mod_forum
In order to edit an existing H5P content
As a user
@ -35,13 +35,13 @@ Feature: Inline editing H5P content in mod_forum
Scenario: Edit H5P content from a forum intro using copy to content bank file
Given I am on the "ForumName1" "forum activity editing" page logged in as admin
# Add H5P content to the forum description.
And I click on "Insert H5P" "button" in the "#fitem_id_introeditor" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
And I click on "Configure H5P content" "button" in the "#fitem_id_introeditor" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
And I click on "Make a copy of the file" "radio"
And I click on "Select this file" "button"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I click on "Save and display" "button"
And I switch to "h5p-iframe" class iframe
And I switch to "h5p-iframe" class iframe
@ -82,12 +82,12 @@ Feature: Inline editing H5P content in mod_forum
# Add H5P content to a forum post as admin.
And I set the following fields to these values:
| Subject | Forum post by admin |
And I click on "Insert H5P" "button" in the "#fitem_id_message" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P" "dialogue"
And I click on "Configure H5P content" "button" in the "#fitem_id_message" "css_element"
And I click on "Browse repositories..." "button" in the "Insert H5P content" "dialogue"
And I select "Content bank" repository in file picker
And I click on "Greeting card" "file" in repository content area
And I click on "Select this file" "button"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I click on "Insert H5P" "button" in the "Insert H5P content" "dialogue"
And I press "Save changes"
And I switch to "h5p-iframe" class iframe
And I switch to "h5p-iframe" class iframe