Skip to content

E
edx-ora2
Commit 9c781483 by Dmitry Viskov Committed by Bill Filler
Options

WYSISYG editor for prompts (in studio) - update tests

parent 0e05549e
Showing with 76 additions and 38 deletions
openassessment/templates/openassessmentblock/oa_submission_answer.html
......@@ -10,7 +10,7 @@
<article class="submission__answer__part__prompt">
<div class="submission__answer__part__prompt__value">
{% if prompts_type == 'html' %}
{% autoescape off %}{{ part.prompt.description }}{% endautoescape %}
{{ part.prompt.description|safe }}
{% else %}
{{ part.prompt.description|linebreaks }}
{% endif %}
......
openassessment/templates/openassessmentblock/response/oa_response.html
......@@ -76,7 +76,7 @@
<article class="submission__answer__part__prompt">
<div class="submission__answer__part__prompt__copy">
{% if prompts_type == 'html' %}
{% autoescape off %}{{ part.prompt.description }}{% endautoescape %}
{{ part.prompt.description|safe }}
{% else %}
{{ part.prompt.description|linebreaks }}
{% endif %}
......
openassessment/xblock/static/js/openassessment-lms.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/js/openassessment-studio.min.js
This source diff could not be displayed because it is too large. You can view the blob instead.
openassessment/xblock/static/js/src/studio/oa_container_item.js
......@@ -109,6 +109,7 @@ OpenAssessment.Prompt.prototype = {
}
var newElId = Date.now() + '-textarea-' + (Math.random() * 100);
$(textarea).attr('id', newElId).tinymce(tinymceCfg());
window.tinyMCE.get(newElId).focus();
}
return $(el);
},
......
openassessment/xblock/test/data/serialize.json
......@@ -4,6 +4,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -54,7 +55,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -85,6 +86,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -135,7 +137,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\" group_access=\"{&quot;381451918&quot;: [1179773159]}\">",
"<openassessment text_response=\"required\" group_access=\"{&quot;381451918&quot;: [1179773159]}\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -163,6 +165,7 @@
"promptless": {
"title": "Foo",
"text_response": "required",
"prompts_type": "html",
"file_upload_response": null,
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
......@@ -207,7 +210,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -236,6 +239,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -279,7 +283,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -308,6 +312,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "[{\"description\": \"Test prompt 1.\"}, {\"description\": \"Test prompt 2.\"}]",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -351,7 +356,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -381,6 +386,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Ṫëṡẗ ṗṛöṁṗẗ",
"prompts_type": "html",
"rubric_feedback_prompt": "†es† Feedbåck Prømp†",
"rubric_feedback_default_text": "Ṫëṡẗ ḋëḟäüḷẗ ẗëẍẗ",
"start": null,
......@@ -426,7 +432,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>ƒσσ</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -455,6 +461,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -498,7 +505,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -527,6 +534,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": null,
"rubric_feedback_default_text": null,
"start": null,
......@@ -570,7 +578,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -597,6 +605,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -635,7 +644,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-06-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -663,6 +672,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -714,7 +724,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-06-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -748,6 +758,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -793,7 +804,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -822,6 +833,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": "2010-04-01T00:00:00",
......@@ -865,7 +877,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\" submission_due=\"2020-04-15T00:00:00\">",
"<openassessment text_response=\"required\" submission_due=\"2020-04-15T00:00:00\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -894,6 +906,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -938,7 +951,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -967,6 +980,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -1011,7 +1025,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -1040,6 +1054,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -1077,7 +1092,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"student-training\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" />",
......@@ -1105,6 +1120,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -1175,7 +1191,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"student-training\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\">",
......@@ -1218,6 +1234,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -1311,7 +1328,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"student-training\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\">",
......@@ -1363,6 +1380,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"start": null,
......@@ -1410,7 +1428,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -1440,6 +1458,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"file_upload_type": null,
......@@ -1479,7 +1498,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -1508,6 +1527,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "Test default text...",
"file_upload_type": "image",
......@@ -1547,7 +1567,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\" file_upload_type=\"image\">",
"<openassessment text_response=\"required\" file_upload_type=\"image\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -1576,6 +1596,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"start": null,
"due": null,
......@@ -1618,7 +1639,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -1646,6 +1667,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": "",
"file_upload_type": "image",
......@@ -1689,7 +1711,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\" file_upload_type=\"image\">",
"<openassessment text_response=\"required\" file_upload_type=\"image\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......@@ -1718,6 +1740,7 @@
"text_response": "required",
"file_upload_response": null,
"prompt": "Test prompt",
"prompts_type": "html",
"rubric_feedback_prompt": "Test Feedback Prompt",
"rubric_feedback_default_text": null,
"start": null,
......@@ -1760,7 +1783,7 @@
}
],
"expected_xml": [
"<openassessment text_response=\"required\">",
"<openassessment text_response=\"required\" prompts_type=\"html\">",
"<title>Foo</title>",
"<assessments>",
"<assessment name=\"peer-assessment\" start=\"2014-02-27T09:46:28\" due=\"2014-03-01T00:00:00\" must_grade=\"5\" must_be_graded_by=\"3\" />",
......
openassessment/xblock/test/test_submission.py
......@@ -266,7 +266,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'submission_start': dt.datetime(4999, 4, 1).replace(tzinfo=pytz.utc),
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -292,7 +293,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'self_incomplete': True,
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -314,7 +316,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'submission_due': dt.datetime(2999, 5, 6).replace(tzinfo=pytz.utc),
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -335,7 +338,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'submit_enabled': False,
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -362,7 +366,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'submission_due': dt.datetime(2999, 5, 6).replace(tzinfo=pytz.utc),
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -389,7 +394,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'submission_due': dt.datetime(2999, 5, 6).replace(tzinfo=pytz.utc),
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -411,7 +417,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'self_incomplete': True,
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -446,7 +453,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'cancelled_by': mock_staff
},
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -475,7 +483,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'self_incomplete': True,
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -490,7 +499,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'submission_due': dt.datetime(2014, 4, 5).replace(tzinfo=pytz.utc),
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -512,7 +522,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'self_incomplete': True,
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -540,7 +551,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'file_upload_type': None,
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......@@ -568,7 +580,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
'file_upload_type': None,
'allow_latex': False,
'user_timezone': None,
'user_language': None
'user_language': None,
'prompts_type': 'text'
}
)
......
openassessment/xblock/test/test_xml.py
......@@ -119,6 +119,7 @@ class TestSerializeContent(TestCase):
self.oa_block.file_upload_response = data.get('file_upload_response', None)
self.oa_block.prompt = data.get('prompt')
self.oa_block.prompts = create_prompts_list(data.get('prompt'))
self.oa_block.prompts_type = data.get('prompts_type', 'text')
self.oa_block.rubric_feedback_prompt = data.get('rubric_feedback_prompt')
self.oa_block.rubric_feedback_default_text = data.get('rubric_feedback_default_text')
self.oa_block.start = _parse_date(data.get('start'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment