Merge branch 'MDL-70980-master' of git://github.com/ferranrecio/moodle

moodle · Mar 25, 2021 · 78e8d63 · 78e8d63
2 parents d65ed58 + b08381b
commit 78e8d63
Show file tree

Hide file tree

Showing 2 changed files with 143 additions and 1 deletion.
diff --git a/mod/h5pactivity/mod_form.php b/mod/h5pactivity/mod_form.php
@@ -140,7 +140,7 @@ public function definition(): void {
         $options = manager::get_review_modes();
         $mform->addElement('select', 'reviewmode', get_string('review_mode', 'mod_h5pactivity'), $options);
         $mform->setType('reviewmode', PARAM_INT);
-        $mform->hideIf('reviewmode', 'enabletracking', 'notchecked');
+        $mform->hideIf('reviewmode', 'enabletracking', 'neq', 1);
 
         // Add standard elements.
         $this->standard_coursemodule_elements();

diff --git a/mod/h5pactivity/tests/behat/attempt_options.feature b/mod/h5pactivity/tests/behat/attempt_options.feature
@@ -0,0 +1,142 @@
+@mod @mod_h5pactivity @core_h5p @javascript
+Feature: Attempts review settings.
+  In order to let users to review attempts
+  As a teacher
+  I need to have specific settings to let students access the attempts report
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | student1 | Student   | 1        | student1@example.com |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | student1 | C1     | student        |
+      | teacher1 | C1     | editingteacher |
+
+  Scenario: Student accessing an activity with attempt review
+    Given the following "activity" exists:
+      | activity       | h5pactivity          |
+      | name           | H5P package          |
+      | intro          | Test H5P description |
+      | course         | C1                   |
+      | idnumber       | h5ppackage           |
+      | enabletracking | 1                    |
+      | reviewmode     | 1                    |
+    And the following "mod_h5pactivity > attempt" exists:
+      | user            | student1    |
+      | h5pactivity     | H5P package |
+      | attempt         | 1           |
+      | interactiontype | compound    |
+      | rawscore        | 2           |
+      | maxscore        | 2           |
+      | duration        | 4           |
+      | completion      | 1           |
+      | success         | 1           |
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "H5P package"
+    Then I should see "View my attempts"
+    And I should not see "This content is displayed in preview mode"
+
+  Scenario: Student accessing an activity without attempt review
+    Given the following "activity" exists:
+      | activity       | h5pactivity          |
+      | name           | H5P package          |
+      | intro          | Test H5P description |
+      | course         | C1                   |
+      | idnumber       | h5ppackage           |
+      | enabletracking | 1                    |
+      | reviewmode     | 0                    |
+    And the following "mod_h5pactivity > attempt" exists:
+      | user            | student1    |
+      | h5pactivity     | H5P package |
+      | attempt         | 1           |
+      | interactiontype | compound    |
+      | rawscore        | 2           |
+      | maxscore        | 2           |
+      | duration        | 4           |
+      | completion      | 1           |
+      | success         | 1           |
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "H5P package"
+    Then I should not see "View my attempts"
+    And I should not see "This content is displayed in preview mode"
+
+  Scenario: Student accessing an activity without tracking
+    Given the following "activity" exists:
+      | activity       | h5pactivity          |
+      | name           | H5P package          |
+      | intro          | Test H5P description |
+      | course         | C1                   |
+      | idnumber       | h5ppackage           |
+      | enabletracking | 0                    |
+    And the following "mod_h5pactivity > attempt" exists:
+      | user            | student1    |
+      | h5pactivity     | H5P package |
+      | attempt         | 1           |
+      | interactiontype | compound    |
+      | rawscore        | 2           |
+      | maxscore        | 2           |
+      | duration        | 4           |
+      | completion      | 1           |
+      | success         | 1           |
+    When I log in as "student1"
+    And I am on "Course 1" course homepage
+    And I follow "H5P package"
+    Then I should not see "View my attempts"
+    And I should see "This content is displayed in preview mode"
+
+  Scenario: Teacher accessing an activity with attempt review
+    Given the following "activity" exists:
+      | activity       | h5pactivity          |
+      | name           | H5P package          |
+      | intro          | Test H5P description |
+      | course         | C1                   |
+      | idnumber       | h5ppackage           |
+      | enabletracking | 1                    |
+      | reviewmode     | 1                    |
+    And the following "mod_h5pactivity > attempt" exists:
+      | user            | student1    |
+      | h5pactivity     | H5P package |
+      | attempt         | 1           |
+      | interactiontype | compound    |
+      | rawscore        | 2           |
+      | maxscore        | 2           |
+      | duration        | 4           |
+      | completion      | 1           |
+      | success         | 1           |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "H5P package"
+    Then I should see "View all attempts (1 submitted)"
+    And I should see "This content is displayed in preview mode"
+
+  Scenario: Teacher accessing an activity without attempt review
+    Given the following "activity" exists:
+      | activity       | h5pactivity          |
+      | name           | H5P package          |
+      | intro          | Test H5P description |
+      | course         | C1                   |
+      | idnumber       | h5ppackage           |
+      | enabletracking | 1                    |
+      | reviewmode     | 0                    |
+    And the following "mod_h5pactivity > attempt" exists:
+      | user            | student1    |
+      | h5pactivity     | H5P package |
+      | attempt         | 1           |
+      | interactiontype | compound    |
+      | rawscore        | 2           |
+      | maxscore        | 2           |
+      | duration        | 4           |
+      | completion      | 1           |
+      | success         | 1           |
+    When I log in as "teacher1"
+    And I am on "Course 1" course homepage
+    And I follow "H5P package"
+    Then I should see "View all attempts (1 submitted)"
+    And I should see "This content is displayed in preview mode"