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 30 additions and 15 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/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