maintain HTML escape characters in FITB RegEx blanks

refs QUIZ-13984 test plan: - Rspec tests pass - test against the associated quiz_api PS Change-Id: Iccfa47dca532cb25bebd06acfa5adf65e3a70ce4 Reviewed-on: https://gerrit.instructure.com/c/qti/+/351783 Tested-by: Service Cloud Jenkins <[email protected]> Reviewed-by: Adrian Diaz <[email protected]> QA-Review: Adrian Diaz <[email protected]> Product-Review: Stephen Kacsmark <[email protected]>
instructure · Jul 15, 2024 · b589808 · b589808
1 parent 0b4e461
commit b589808
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/qti/v1/models/interactions/base_fill_blank_interaction.rb b/lib/qti/v1/models/interactions/base_fill_blank_interaction.rb
@@ -129,7 +129,7 @@ def canvas_blank_choice(bnode, index)
             choice = {
               id: bnode_id,
               position: index + 1,
-              item_body: bnode.at_xpath('.//xmlns:mattext').text
+              item_body: bnode.at_xpath('.//xmlns:mattext').inner_html
             }
             @blank_choices ||= {}
             @blank_choices[bnode_id] = choice

diff --git a/lib/qti/version.rb b/lib/qti/version.rb
@@ -1,3 +1,3 @@
 module Qti
-  VERSION = '2.23.1'.freeze
+  VERSION = '2.23.2'.freeze
 end
diff --git a/spec/fixtures/items_1.2/nq_multiple_fib_scoring_algorithms.xml b/spec/fixtures/items_1.2/nq_multiple_fib_scoring_algorithms.xml
@@ -80,12 +80,12 @@
       </response_lid>
       <response_lid ident="response_a053119f-6a61-4372-ac79-4b2a7de0232f">
         <material>
-          <mattext>^orange$</mattext>
+          <mattext>^orange&lt;s&gt;$</mattext>
         </material>
         <render_choice>
           <response_label ident="a053119f-6a61-4372-ac79-4b2a7de0232f-0" scoring_algorithm='TextRegex' answer_type='openEntry'>
             <material>
-              <mattext texttype="text/plain">^orange$</mattext>
+              <mattext texttype="text/plain">^orange&lt;s&gt;$</mattext>
             </material>
           </response_label>
         </render_choice>

diff --git a/spec/lib/qti/v1/models/interactions/fill_blank_interaction_spec.rb b/spec/lib/qti/v1/models/interactions/fill_blank_interaction_spec.rb
@@ -243,7 +243,7 @@
          41dfd716-8fd9-466a-97fa-33d353e44b42-1
          a053119f-6a61-4372-ac79-4b2a7de0232f-0]
     end
-    let(:scoring_data_values) { %w[red blue green yellow teal ^orange$] }
+    let(:scoring_data_values) { %w[red blue green yellow teal ^orange<s>$] }
     let(:scoring_data_case) { %w[no no no no no no] }
     let(:scoring_data_algorithm) do
       %w[TextContainsAnswer TextCloseEnough TextEquivalence TextInChoices TextInChoices TextRegex]
@@ -284,7 +284,7 @@
          type: 'blank' },
        { id: 'stem_8', position: 9, type: 'text', value: ', and ' },
        { blank_id: 'response_a053119f-6a61-4372-ac79-4b2a7de0232f',
-         blank_name: '^orange$',
+         blank_name: '^orange&lt;s&gt;$',
          id: 'stem_9',
          position: 10,
          type: 'blank' },