Merge branch 'dev' of https://github.com/maths/moodle-qtype_stack into code-tidy

EJMFarrow · EJMFarrow · commit adccda8b362c · 2024-12-17T13:10:25.000Z
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:14
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
diff --git a/questionlibrary.php b/questionlibrary.php
@@ -40,7 +40,11 @@
     require_login($cm->course, false, $cm);
     $thiscontext = context_module::instance($cmid);
     $urlparams['cmid'] = $cmid;
-    $returntext = get_string('stack_library_quiz_return', 'qtype_stack');
+    if (strpos(optional_param('returnurl', null, PARAM_LOCALURL), 'quiz') !== false) {
+        $returntext = get_string('stack_library_quiz_return', 'qtype_stack');
+    } else {
+        $returntext = get_string('stack_library_qb_return', 'qtype_stack');
+    }
 } else if ($courseid = optional_param('courseid', 0, PARAM_INT)) {
     require_login($courseid);
     $thiscontext = context_course::instance($courseid);
diff --git a/stack/input/dropdown/dropdown.class.php b/stack/input/dropdown/dropdown.class.php
@@ -254,7 +254,9 @@ public function adapt_to_model_answer($teacheranswer) {
                     // In case we see CASText2 values we need to postproc them.
                     $tmp = castext2_parser_utils::string_to_list($display, true);
                     $tmp = castext2_parser_utils::unpack_maxima_strings($tmp);
-                    $ddlvalues[$key]['display'] = castext2_parser_utils::postprocess_parsed($tmp);
+                    $holder = new castext2_placeholder_holder();
+                    $ddlvalues[$key]['display'] = castext2_parser_utils::postprocess_parsed($tmp, null, $holder);
+                    $ddlvalues[$key]['display'] = $holder->replace($ddlvalues[$key]['display']);
                 } else {
                     $cs = stack_ast_container::make_from_teacher_source($display);
                     if ($cs->get_valid()) {
@@ -264,8 +266,10 @@ public function adapt_to_model_answer($teacheranswer) {
                 }
                 if ($ddlvalues[$key]['correct']) {
                     if (substr($display, 0, 9) === '["%root",') {
-                        $tmp = castext2_parser_utils::unpack_maxima_strings($display);
-                        $correctanswerdisplay[] = castext2_parser_utils::postprocess_parsed($tmp);
+                        $tmp = castext2_parser_utils::string_to_list($display, true);
+                        $tmp = castext2_parser_utils::unpack_maxima_strings($tmp);
+                        $holder = new castext2_placeholder_holder();
+                        $correctanswerdisplay[] = castext2_parser_utils::postprocess_parsed($tmp, null, $holder);
                     } else {
                         $correctanswerdisplay[] = $display;
                     }
@@ -336,7 +340,10 @@ public function adapt_to_model_answer($teacheranswer) {
                 // And now we need to care about holders.
                 $holder = new castext2_placeholder_holder();
                 $ddlvalues[$key]['display'] = castext2_parser_utils::postprocess_mp_parsed(
-                    $at1->get_by_key('val'.$key)->get_evaluated(), $holder);
+                    $at1->get_by_key('val'.$key)->get_evaluated(),
+                    null,
+                    $holder,
+                );
                 $ddlvalues[$key]['display'] = $holder->replace($ddlvalues[$key]['display']);
             } else if (substr($display, 0, 1) == '"') {
                 $ddlvalues[$key]['display'] = stack_utils::maxima_string_to_php_string($display);
diff --git a/tests/behat/library.feature b/tests/behat/library.feature
@@ -64,8 +64,9 @@ Feature: Test STACK library
     And I should see "CR-Diff-02-linearity-1.b"
 
   @javascript
-  Scenario: Import a question starting from quiz in Moodle ≥ 4.3.
+  Scenario: Import a question starting from quiz in 4.3 <= Moodle <= 4.5.
     Given the site is running Moodle version 4.3 or higher
+    Given the site is running Moodle version 4.5 or lower
     When I am on the "Quiz 1" "mod_quiz > Edit" page logged in as "teacher"
     When I open the "last" add to quiz menu
     And I follow "a new question"
@@ -86,3 +87,25 @@ Feature: Test STACK library
     And I click on "ul[id^=form_autocomplete_suggestions] li:nth-child(3)" "css_element"
     And I click on "Apply filters" "button"
     And I should see "CR-Diff-02-linearity-1.b"
+
+  @javascript
+  Scenario: Import a question starting from quiz in Moodle ≥ 5.0.
+    Given the site is running Moodle version 5.0 or higher
+    When I am on the "Quiz 1" "mod_quiz > Edit" page logged in as "teacher"
+    When I open the "last" add to quiz menu
+    And I follow "a new question"
+    And I set the field "item_qtype_stack" to "1"
+    And I press "submitbutton"
+    And I click on "STACK question library" "link"
+    Then I should see "Default for Quiz 1"
+    And I should not see "Question variables"
+    And I click on "Calculus-Refresher" "button"
+    And I click on "CR_Diff_02" "button"
+    And I click on "CR-Diff-02-linearity-1-b.xml" "button"
+    And I should see "Differentiate \[{@p@}\] with respect to {@v@}. [[input:ans1]]"
+    And I click on "Import" "button"
+    And I click on "Return to quiz" "link"
+    And I open the "last" add to quiz menu
+    And I follow "from question bank"
+    And I should see "Default for Quiz 1 (1)"
+    And I should see "CR-Diff-02-linearity-1.b"
diff --git a/tests/editform_test.php b/tests/editform_test.php
@@ -38,14 +38,26 @@
 final class editform_test_class extends \qtype_stack_edit_form {
 
     // phpcs:ignore moodle.Commenting.MissingDocblock.MissingTestcaseMethodDescription
-    public function __construct($questiontext, $specificfeedback) {
+    public function __construct($questiontext, $specificfeedback, $quizmoduleid) {
         global $USER;
-        $syscontext = \context_system::instance();
-        $category = question_make_default_categories([$syscontext]);
+        // ISS1325 - Use quiz context rather than system context as
+        // question categories only allowed in modules from Moodle 5.
+        $quizcontext = \context_module::instance($quizmoduleid);
+        if (function_exists('question_get_default_category')) {
+            // This function exists from Moodle 4.5 onwards but the second parameter
+            // which creates the category if it doesn't exist is 5.0 onwards.
+            $category = question_get_default_category($quizcontext->id, true);
+            if (!$category) {
+                $category = $category = question_make_default_categories([$quizcontext]);
+            }
+        } else {
+            // Deprecated from 5.0.
+            $category = $category = question_make_default_categories([$quizcontext]);
+        }
         $fakequestion = new \stdClass();
         $fakequestion->qtype = 'stack';
         $fakequestion->category = $category->id;
-        $fakequestion->contextid = $syscontext->id;
+        $fakequestion->contextid = $quizcontext->id;
         $fakequestion->createdby = $USER->id;
         $fakequestion->modifiedby = $USER->id;
         $fakequestion->questiontext = $questiontext;
@@ -57,9 +69,9 @@ public function __construct($questiontext, $specificfeedback) {
         $fakequestion->inputs = null;
         // Support both Moodle 4.x and 3.x.
         if (class_exists('\core_question\local\bank\question_edit_contexts')) {
-            $contexts = new \core_question\local\bank\question_edit_contexts($syscontext);
+            $contexts = new \core_question\local\bank\question_edit_contexts($quizcontext);
         } else {
-            $contexts = new \question_edit_contexts($syscontext);
+            $contexts = new \question_edit_contexts($quizcontext);
         }
         parent::__construct(new \moodle_url('/'), $fakequestion, $category, $contexts);
     }
@@ -81,8 +93,12 @@ final class editform_test extends \advanced_testcase {
     protected function get_form($questiontext, $specificfeedback) {
         $this->setAdminUser();
         $this->resetAfterTest();
-
-        return new editform_test_class($questiontext, $specificfeedback);
+        $quizgenerator = self::getDataGenerator()->get_plugin_generator('mod_quiz');
+        $site = get_site();
+        // Add a quiz to the site course.
+        $quiz = $quizgenerator->create_instance(['course' => $site->id, 'grade' => 100.0, 'sumgrades' => 2, 'layout' => '1,0']);
+        $quizmoduleid = $quiz->cmid;
+        return new editform_test_class($questiontext, $specificfeedback, $quizmoduleid);
     }
 
     public function test_get_input_names_from_question_text_default(): void {
diff --git a/tests/input_dropdown_test.php b/tests/input_dropdown_test.php
@@ -428,4 +428,21 @@ public function test_decimals(): void {
         $expected = 'A correct answer is: <code>3,1415</code>';
         $this->assertEquals($expected, $el->get_teacher_answer_display(false, false));
     }
+
+    public function test_validate_student_response_castext() {
+        $options = new stack_options();
+        $ta = '[[1+x^2,false],[1-x^2,false],' .
+            '["1+x^3",true,["%root","Hello world ",["smlt","\\({x^3}\\)"]]]]';
+        $el = stack_input_factory::make('dropdown', 'ans1', $ta, $options, ['options' => '']);
+        $el->adapt_to_model_answer($ta);
+        $state = $el->validate_student_response(['ans1' => '2'], $options, '2', new stack_cas_security());
+        $this->assertEquals(stack_input::SCORE, $state->status);
+
+        $ta = '[[1+x^2,true],[1-x^2,false],' .
+            '["1+x^3",false,["%root","Hello world ",["smlt","\\({x^3}\\)"]]]]';
+        $el = stack_input_factory::make('dropdown', 'ans1', $ta, $options, ['options' => '']);
+        $el->adapt_to_model_answer($ta);
+        $state = $el->validate_student_response(['ans1' => '2'], $options, '2', new stack_cas_security());
+        $this->assertEquals(stack_input::SCORE, $state->status);
+    }
 }
diff --git a/tests/library_import_test.php b/tests/library_import_test.php
@@ -105,13 +105,13 @@ public function test_not_logged_in(): void {
     }
 
     /**
-     * Test the library_import function fails when no webservice export capability assigned.
+     * Test the library_import function fails when no capability to add questions assigned.
      */
-    public function test_no_webservice_access(): void {
+    public function test_no_access(): void {
         global $DB;
         $context = context_course::instance($this->course->id);
-        $studentroleid = $DB->get_field('role', 'id', ['shortname' => 'student']);
-        role_assign($studentroleid, $this->user->id, $context->id);
+        $teacherroleid = $DB->get_field('role', 'id', ['shortname' => 'teacher']);
+        role_assign($teacherroleid, $this->user->id, $context->id);
         $this->getDataGenerator()->enrol_user($this->user->id, $this->course->id);
         $this->expectException(required_capability_exception::class);
         $this->expectExceptionMessage('you do not currently have permissions to do that (Add new questions).');
diff --git a/tests/library_render_test.php b/tests/library_render_test.php
@@ -108,13 +108,13 @@ public function test_not_logged_in(): void {
     }
 
     /**
-     * Test the library_render function fails when no webservice export capability assigned.
+     * Test the library_render function fails when no capability assigned.
      */
     public function test_no_webservice_access(): void {
         global $DB;
         $context = context_course::instance($this->course->id);
-        $studentroleid = $DB->get_field('role', 'id', ['shortname' => 'student']);
-        role_assign($studentroleid, $this->user->id, $context->id);
+        $teacherroleid = $DB->get_field('role', 'id', ['shortname' => 'teacher']);
+        role_assign($teacherroleid, $this->user->id, $context->id);
         $this->getDataGenerator()->enrol_user($this->user->id, $this->course->id);
         $this->expectException(required_capability_exception::class);
         $this->expectExceptionMessage('you do not currently have permissions to do that (Add new questions).');
