Commit c78663b4 by Braden MacDonald

Fix review comments

parent b30ab46b
...@@ -24,7 +24,7 @@ from django.utils.safestring import mark_safe ...@@ -24,7 +24,7 @@ from django.utils.safestring import mark_safe
from lazy import lazy from lazy import lazy
import uuid import uuid
from xblock.core import XBlock from xblock.core import XBlock
from xblock.fields import Scope, String, Float from xblock.fields import Scope, String
from xblock.fragment import Fragment from xblock.fragment import Fragment
from xblock.validation import ValidationMessage from xblock.validation import ValidationMessage
from xblockutils.helpers import child_isinstance from xblockutils.helpers import child_isinstance
......
...@@ -26,7 +26,6 @@ import uuid ...@@ -26,7 +26,6 @@ import uuid
from xblock.core import XBlock from xblock.core import XBlock
from xblock.fields import Scope, String, Float from xblock.fields import Scope, String, Float
from xblock.fragment import Fragment from xblock.fragment import Fragment
from xblock.validation import ValidationMessage
from xblockutils.studio_editable import StudioEditableXBlockMixin from xblockutils.studio_editable import StudioEditableXBlockMixin
from xblockutils.resources import ResourceLoader from xblockutils.resources import ResourceLoader
...@@ -52,7 +51,8 @@ class SliderBlock( ...@@ -52,7 +51,8 @@ class SliderBlock(
SubmittingXBlockMixin, QuestionMixin, StudioEditableXBlockMixin, XBlockWithTranslationServiceMixin, XBlock, SubmittingXBlockMixin, QuestionMixin, StudioEditableXBlockMixin, XBlockWithTranslationServiceMixin, XBlock,
): ):
""" """
An XBlock used to ask multiple-choice questions An XBlock used by students to indicate a numeric value on a sliding scale.
The student's answer is always considered "correct".
""" """
CATEGORY = 'pb-slider' CATEGORY = 'pb-slider'
STUDIO_LABEL = _(u"Ranged Value Slider") STUDIO_LABEL = _(u"Ranged Value Slider")
...@@ -145,7 +145,7 @@ class SliderBlock( ...@@ -145,7 +145,7 @@ class SliderBlock(
self.student_value = value self.student_value = value
if sub_api: if sub_api:
# Also send to the submissions API: # Also send to the submissions API:
sub_api.create_submission(self.student_item_key, {'value': value, }) sub_api.create_submission(self.student_item_key, {'value': value})
result = self.get_last_result() result = self.get_last_result()
log.debug(u'Slider submission result: %s', result) log.debug(u'Slider submission result: %s', result)
return result return result
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# Imports ########################################################### # Imports ###########################################################
from .base_test import ProblemBuilderBaseTest, MentoringAssessmentBaseTest, CORRECT, GetChoices from .base_test import ProblemBuilderBaseTest, MentoringAssessmentBaseTest, GetChoices
# Classes ########################################################### # Classes ###########################################################
...@@ -81,8 +81,7 @@ class SliderBlockTest(SliderBlockTestMixins, ProblemBuilderBaseTest): ...@@ -81,8 +81,7 @@ class SliderBlockTest(SliderBlockTestMixins, ProblemBuilderBaseTest):
self.assertEqual(self.get_slider_value(), 15) self.assertEqual(self.get_slider_value(), 15)
self.assertFalse(self.submit_button.is_enabled()) self.assertFalse(self.submit_button.is_enabled())
# Choose a choice: # Choose a choice:
mcq_choices = pb_wrapper.find_elements_by_css_selector('.choices .choice input') GetChoices(pb_wrapper).select('Yes')
mcq_choices[0].click()
self.assertTrue(self.submit_button.is_enabled()) self.assertTrue(self.submit_button.is_enabled())
self.click_submit(pb_wrapper) self.click_submit(pb_wrapper)
# Now, we expect submit to be disabled and the checkmark to be visible: # Now, we expect submit to be disabled and the checkmark to be visible:
......
<step-builder display_name="Step Builder" max_attempts="90"> <step-builder display_name="Step Builder">
<sb-step display_name="Slider step"> <sb-step display_name="Slider step">
<pb-slider name="slider_1" display_name="Information Reliability" question="How reliable is this information?" min_label="0%" max_label="100%" /> <pb-slider name="slider_1" display_name="Information Reliability" question="How reliable is this information?" min_label="0%" max_label="100%" />
......
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