moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-76691-master' of https://github.com/sarjona/moodle

Browse source
This commit is contained in:
Andrew Nicols 2023-02-07 10:36:40 +08:00
commit 81f9751c9e
86 changed files with 4681 additions and 952 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/db/caches.php
View file

@ -487,6 +487,13 @@ $definitions = array(
'simpledata' => true,
],
// File cache for H5P Library ids.
'h5p_libraries' => [
'mode' => cache_store::MODE_APPLICATION,
'simplekeys' => true,
'canuselocalstore' => true
],
// File cache for H5P Library files.
'h5p_library_files' => [
'mode' => cache_store::MODE_APPLICATION,

15
lib/editor/atto/plugins/h5p/tests/behat/h5p.feature
View file

@ -130,7 +130,7 @@ Feature: Add h5ps to Atto
And I should not see "Cloudberries"
@javascript
Scenario: Enable/disable H5P options
Scenario: Enable/disable H5P options atto
Given I log in as "admin"
And I follow "Manage private files..."
And I upload "h5p/tests/fixtures/guess-the-answer.h5p" file to "Files" filemanager
@ -143,14 +143,11 @@ Feature: Add h5ps to Atto
And I click on "Select this file" "button"
# No display option button displayed
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I wait until the page is ready
When I click on "Save and display" "button"
And I wait until the page is ready
And I switch to "h5pcontent" iframe
And I switch to "h5p-iframe" class iframe
Then I should not see "Reuse"
And I should not see "Embed"
And I should not see "Rights of use"
Then ".h5p-actions" "css_element" should not exist
And I switch to the main frame
And I navigate to "Settings" in current page administration
And I click on ".h5p-placeholder" "css_element"
@ -159,12 +156,10 @@ Feature: Add h5ps to Atto
# Only Allow Download button displayed
And I click on "Allow download" "checkbox"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I wait until the page is ready
And I click on "Save and display" "button"
And I wait until the page is ready
And I switch to "h5pcontent" iframe
And I switch to "h5p-iframe" class iframe
And I should see "Reuse"
And "Reuse" "text" should exist in the ".h5p-actions" "css_element"
And I should not see "Embed"
And I should not see "Rights of use"
And I switch to the main frame
@ -176,12 +171,10 @@ Feature: Add h5ps to Atto
And I click on "Embed button" "checkbox"
And I click on "Copyright button" "checkbox"
And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
And I wait until the page is ready
And I click on "Save and display" "button"
And I wait until the page is ready
And I switch to "h5pcontent" iframe
And I switch to "h5p-iframe" class iframe
And I should not see "Reuse"
And "Reuse" "text" should not exist in the ".h5p-actions" "css_element"
And I should see "Embed"
And I should see "Rights of use"

10
lib/editor/tiny/plugins/h5p/tests/behat/h5p.feature
View file

@ -103,7 +103,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
And I should not see "Cloudberries"
@javascript
Scenario: Enable/disable H5P options
Scenario: Enable/disable H5P options tiny
Given I log in as "admin"
And I follow "Manage private files..."
And I upload "h5p/tests/fixtures/guess-the-answer.h5p" file to "Files" filemanager
@ -118,9 +118,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
When I click on "Save and display" "button"
And I switch to "h5pcontent" iframe
And I switch to "h5p-iframe" class iframe
Then I should not see "Reuse"
And I should not see "Embed"
And I should not see "Rights of use"
Then ".h5p-actions" "css_element" should not exist
And I switch to the main frame
And I navigate to "Settings" in current page administration
And I select the ".h5p-placeholder" "css_element" in the "Page content" TinyMCE editor
@ -132,7 +130,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
And I click on "Save and display" "button"
And I switch to "h5pcontent" iframe
And I switch to "h5p-iframe" class iframe
And I should see "Reuse"
And "Reuse" "text" should exist in the ".h5p-actions" "css_element"
And I should not see "Embed"
And I should not see "Rights of use"
And I switch to the main frame
@ -147,7 +145,7 @@ Feature: Use the TinyMCE editor to upload an h5p package
And I click on "Save and display" "button"
And I switch to "h5pcontent" iframe
And I switch to "h5p-iframe" class iframe
And I should not see "Reuse"
And "Reuse" "text" should not exist in the ".h5p-actions" "css_element"
And I should see "Embed"
And I should see "Rights of use"