Merge branch 'feature/alex/poll-storage-model' of github.com:MITx/mitx into…

Merge branch 'feature/alex/poll-storage-model' of github.com:MITx/mitx into feature/alex/poll-storage-model

common/lib/xmodule/xmodule/conditional_module.py

@@ -10,9 +10,10 @@ from pkg_resources import resource_string
 from xmodule.x_module import XModule
 from xmodule.modulestore import Location
 from xmodule.seq_module import SequenceDescriptor
-from xblock.core import String, Scope
+from xblock.core import String, Scope, List
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
+
 log = logging.getLogger('mitx.' + __name__)
 
 
@@ -112,6 +113,8 @@ class ConditionalModule(XModule):
 
 class ConditionalDescriptor(SequenceDescriptor):
     """Descriptor for conditional xmodule."""
+    _tag_name = 'conditional'
+
     module_class = ConditionalModule
 
     filename_extension = "xml"
@@ -119,6 +122,8 @@ class ConditionalDescriptor(SequenceDescriptor):
     stores_state = True
     has_score = False
 
+    show_tag_list = List(help="Poll answers", scope=Scope.content)
+
     def get_required_module_descriptors(self):
         """TODO: Returns a list of XModuleDescritpor instances upon which this module depends, but are
         not children of this module"""
@@ -155,9 +160,12 @@ class ConditionalDescriptor(SequenceDescriptor):
             return urls
 
         children = []
+        show_tag_list = []
         for child in xml_object:
             if child.tag == 'show':
-                children.extend(parse_show_tag(child))
+                location = parse_show_tag(child)
+                children.extend(location)
+                show_tag_list.extend(location)
             else:
                 try:
                     descriptor = system.process_xml(etree.tostring(child))
@@ -165,11 +173,17 @@ class ConditionalDescriptor(SequenceDescriptor):
                     children.append(module_url)
                 except:
                     log.exception("Unable to load child when parsing Conditional.")
-        return {}, children
+        return {'show_tag_list': show_tag_list}, children
 
     def definition_to_xml(self, resource_fs):
-        xml_object = etree.Element('sequential')
+        xml_object = etree.Element(self._tag_name)
         for child in self.get_children():
-            xml_object.append(
-                etree.fromstring(child.export_to_xml(resource_fs)))
+            location = str(child.location)
+            if location in self.show_tag_list:
+                show_str = '<{tag_name} sources="{sources}" />'.format(
+                    tag_name='show', sources=location)
+                xml_object.append(etree.fromstring(show_str))
+            else:
+                xml_object.append(
+                    etree.fromstring(child.export_to_xml(resource_fs)))
         return xml_object

common/lib/xmodule/xmodule/poll_module.py

@@ -75,7 +75,7 @@ class PollModule(XModule):
                                'poll_answers': self.poll_answers,
                                'total': sum(self.poll_answers.values())
                                })
-        else: # return error message
+        else:  # return error message
             return json.dumps({'error': 'Unknown Command!'})
 
     def get_html(self):

common/lib/xmodule/xmodule/tests/test_export.py

@@ -98,8 +98,8 @@ class RoundTripTestCase(unittest.TestCase):
     def test_full_roundtrip(self):
         self.check_export_roundtrip(DATA_DIR, "full")
 
-    def test_poll_roundtrip(self):
-        self.check_export_roundtrip(DATA_DIR, "poll")
+    def test_conditional_and_poll_roundtrip(self):
+        self.check_export_roundtrip(DATA_DIR, "conditional_and_poll")
 
     def test_selfassessment_roundtrip(self):
         #Test selfassessment xmodule to see if it exports correctly

common/lib/xmodule/xmodule/tests/test_import.py

@@ -319,7 +319,7 @@ class ImportTestCase(unittest.TestCase):
             self.assertEqual(len(video.url_name), len('video_') + 12)
 
     def test_poll_xmodule(self):
-        modulestore = XMLModuleStore(DATA_DIR, course_dirs=['poll'])
+        modulestore = XMLModuleStore(DATA_DIR, course_dirs=['conditional_and_poll'])
 
         course = modulestore.get_courses()[0]
         chapters = course.get_children()
@@ -332,7 +332,7 @@ class ImportTestCase(unittest.TestCase):
         location = Location(location.tag, location.org, location.course,
             'sequential', 'Problem_Demos')
         module = modulestore.get_instance(course.id, location)
-        self.assertEqual(len(module.children), 1)
+        self.assertEqual(len(module.children), 2)
 
     def test_error_on_import(self):
         '''Check that when load_error_module is false, an exception is raised, rather than returning an ErrorModule'''

common/lib/xmodule/xmodule/tests/test_logic.py

@@ -4,6 +4,7 @@ import json
 import unittest
 
 from xmodule.poll_module import PollModule
+from xmodule.conditional_module import ConditionalModule
 
 
 class LogicTest(unittest.TestCase):
@@ -46,3 +47,19 @@ class PollModuleTest(LogicTest):
         self.assertEqual(total, 2)
         self.assertDictEqual(callback, {'objectName': 'Conditional'})
         self.assertEqual(self.xmodule.poll_answer, 'No')
+
+
+class ConditionalModuleTest(LogicTest):
+    xmodule_class = ConditionalModule
+    raw_model_data = {
+        'contents': 'Some content'
+    }
+
+    def test_ajax_request(self):
+        # Mock is_condition_satisfied
+        self.xmodule.is_condition_satisfied = lambda: True
+
+        response = self.ajax_request('No', {})
+        html = response['html']
+
+        self.assertEqual(html, 'Some content')

common/test/data/conditional_and_poll/course.xml

+roots/2013_Spring.xml
\ No newline at end of file

common/test/data/poll/sequential/Problem_Demos.xml → common/test/data/conditional_and_poll/sequential/Problem_Demos.xml

@@ -9,5 +9,23 @@
             <answer id="No">No</answer>
             <answer id="Dont_know">Don't know</answer>
         </poll_question>
+        <poll_question id="second_poll" display_name="second poll">
+                <h3>What's the Right Thing to Do?</h3>
+                <p>Suppose four shipwrecked sailors are stranded at sea in a lifeboat, without
+    food or water. Would it be wrong for three of them to kill and eat the cabin
+    boy, in order to save their own lives?</p>
+            <answer id="Yes">Yes</answer>
+            <answer id="No">No</answer>
+            <answer id="Dont_know">Don't know</answer>
+        </poll_question>
     </vertical>
+
+    <wrapper>
+        <!-- Test many show tags -->
+        <html>Condition: first_poll - Yes</html>
+        <conditional sources="i4x://HarvardX/ER22x/poll_question/first_poll" poll_answer="Yes">
+            <html>In first condition.</html>
+            <show sources="i4x://HarvardX/ER22x/poll_question/second_poll"/>
+        </conditional>
+    </wrapper>
 </sequential>

common/test/data/poll/course.xml

-roots/2013_Spring.xml
\ No newline at end of file