Fix existing tests.

drag_and_drop_v2/drag_and_drop_v2.py

@@ -228,7 +228,7 @@ class DragAndDropBlock(XBlock):
         is_correct = False
         is_correct_location = False
 
-        if 'input' in attempt:
+        if 'input' in attempt:  # Student submitted numerical value for item
             state = self._get_item_state().get(str(item['id']))
             if state:
                 state['input'] = attempt['input']
@@ -238,7 +238,7 @@ class DragAndDropBlock(XBlock):
                     feedback = item['feedback']['correct']
                 else:
                     is_correct = False
-        elif item['zone'] == attempt['zone']:
+        elif item['zone'] == attempt['zone']:  # Student placed item in zone
             is_correct_location = True
             if 'inputOptions' in item:
                 # Input value will have to be provided for the item.

tests/unit/test_advanced.py

@@ -87,6 +87,7 @@ class BaseDragAndDropAjaxFixture(TestCaseMixin):
         })
 
     def test_do_attempt_with_input(self):
+        # Drop item that requires numerical input
         data = {"val": 1, "zone": self.ZONE_2, "x_percent": "0%", "y_percent": "85%"}
         res = self.call_handler('do_attempt', data)
         self.assertEqual(res, {
@@ -99,13 +100,16 @@ class BaseDragAndDropAjaxFixture(TestCaseMixin):
 
         expected_state = {
             'items': {
-                "1": {"x_percent": "0%", "y_percent": "85%", "correct_input": False},
+                "1": {
+                    "x_percent": "0%", "y_percent": "85%", "correct_input": False, "zone": self.ZONE_2,
+                },
             },
             'finished': False,
             'overall_feedback': self.initial_feedback(),
         }
         self.assertEqual(expected_state, self.call_handler('get_user_state', method="GET"))
 
+        # Submit incorrect value
         data = {"val": 1, "input": "250"}
         res = self.call_handler('do_attempt', data)
         self.assertEqual(res, {
@@ -118,13 +122,17 @@ class BaseDragAndDropAjaxFixture(TestCaseMixin):
 
         expected_state = {
             'items': {
-                "1": {"x_percent": "0%", "y_percent": "85%", "input": "250", "correct_input": False},
+                "1": {
+                    "x_percent": "0%", "y_percent": "85%", "correct_input": False, "zone": self.ZONE_2,
+                    "input": "250",
+                },
             },
             'finished': False,
             'overall_feedback': self.initial_feedback(),
         }
         self.assertEqual(expected_state, self.call_handler('get_user_state', method="GET"))
 
+        # Submit correct value
         data = {"val": 1, "input": "103"}
         res = self.call_handler('do_attempt', data)
         self.assertEqual(res, {
@@ -137,7 +145,10 @@ class BaseDragAndDropAjaxFixture(TestCaseMixin):
 
         expected_state = {
             'items': {
-                "1": {"x_percent": "0%", "y_percent": "85%", "input": "103", "correct_input": True},
+                "1": {
+                    "x_percent": "0%", "y_percent": "85%", "correct_input": True, "zone": self.ZONE_2,
+                    "input": "103",
+                },
             },
             'finished': False,
             'overall_feedback': self.initial_feedback(),
@@ -177,7 +188,7 @@ class BaseDragAndDropAjaxFixture(TestCaseMixin):
 
         expected_state = {
             "items": {
-                "0": {"x_percent": "33%", "y_percent": "11%", "correct_input": True}
+                "0": {"x_percent": "33%", "y_percent": "11%", "correct_input": True, "zone": self.ZONE_1}
             },
             "finished": False,
             'overall_feedback': self.initial_feedback(),
@@ -198,8 +209,13 @@ class BaseDragAndDropAjaxFixture(TestCaseMixin):
 
         expected_state = {
             "items": {
-                "0": {"x_percent": "33%", "y_percent": "11%", "correct_input": True},
-                "1": {"x_percent": "22%", "y_percent": "22%", "input": "99", "correct_input": True}
+                "0": {
+                    "x_percent": "33%", "y_percent": "11%", "correct_input": True, "zone": self.ZONE_1,
+                },
+                "1": {
+                    "x_percent": "22%", "y_percent": "22%", "correct_input": True, "zone": self.ZONE_2,
+                    "input": "99",
+                }
             },
             "finished": True,
             'overall_feedback': self.FINAL_FEEDBACK,

tests/unit/test_basics.py

 import unittest
 
 from drag_and_drop_v2.default_data import (
-    TARGET_IMG_DESCRIPTION, START_FEEDBACK, FINISH_FEEDBACK, DEFAULT_DATA
+    TARGET_IMG_DESCRIPTION, TOP_ZONE_TITLE, MIDDLE_ZONE_TITLE, BOTTOM_ZONE_TITLE,
+    START_FEEDBACK, FINISH_FEEDBACK, DEFAULT_DATA
 )
 from ..utils import make_block, TestCaseMixin
 
@@ -62,25 +63,25 @@ class BasicTests(TestCaseMixin, unittest.TestCase):
         assert_user_state_empty()
 
         # Drag three items into the correct spot:
-        data = {"val": 0, "zone": "The Top Zone", "x_percent": "33%", "y_percent": "11%"}
+        data = {"val": 0, "zone": TOP_ZONE_TITLE, "x_percent": "33%", "y_percent": "11%"}
         self.call_handler('do_attempt', data)
-        data = {"val": 1, "zone": "The Middle Zone", "x_percent": "67%", "y_percent": "80%"}
+        data = {"val": 1, "zone": MIDDLE_ZONE_TITLE, "x_percent": "67%", "y_percent": "80%"}
         self.call_handler('do_attempt', data)
-        data = {"val": 2, "zone": "The Bottom Zone", "x_percent": "99%", "y_percent": "95%"}
+        data = {"val": 2, "zone": BOTTOM_ZONE_TITLE, "x_percent": "99%", "y_percent": "95%"}
         self.call_handler('do_attempt', data)
 
         # Check the result:
         self.assertTrue(self.block.completed)
         self.assertEqual(self.block.item_state, {
-            '0': {'x_percent': '33%', 'y_percent': '11%'},
-            '1': {'x_percent': '67%', 'y_percent': '80%'},
-            '2': {'x_percent': '99%', 'y_percent': '95%'},
+            '0': {'x_percent': '33%', 'y_percent': '11%', 'zone': TOP_ZONE_TITLE},
+            '1': {'x_percent': '67%', 'y_percent': '80%', 'zone': MIDDLE_ZONE_TITLE},
+            '2': {'x_percent': '99%', 'y_percent': '95%', 'zone': BOTTOM_ZONE_TITLE},
         })
         self.assertEqual(self.call_handler('get_user_state'), {
             'items': {
-                '0': {'x_percent': '33%', 'y_percent': '11%', 'correct_input': True},
-                '1': {'x_percent': '67%', 'y_percent': '80%', 'correct_input': True},
-                '2': {'x_percent': '99%', 'y_percent': '95%', 'correct_input': True},
+                '0': {'x_percent': '33%', 'y_percent': '11%', 'correct_input': True, 'zone': TOP_ZONE_TITLE},
+                '1': {'x_percent': '67%', 'y_percent': '80%', 'correct_input': True, 'zone': MIDDLE_ZONE_TITLE},
+                '2': {'x_percent': '99%', 'y_percent': '95%', 'correct_input': True, 'zone': BOTTOM_ZONE_TITLE},
             },
             'finished': True,
             'overall_feedback': FINISH_FEEDBACK,