fixup! Implement Show Answer button

Close feedback box when clicking Show Answer.
openedx · Sep 20, 2016 · c10d1b2 · c10d1b2
1 parent adcbf1c
commit c10d1b2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/drag_and_drop_v2/public/js/drag_and_drop.js b/drag_and_drop_v2/public/js/drag_and_drop.js
@@ -1125,6 +1125,7 @@ function DragAndDropBlock(runtime, element, configuration) {
         }).done(function(data) {
             state.items = data.items;
             state.showing_answer = true;
+            delete state.feedback;
         }).always(function() {
             state.show_answer_spinner = false;
             applyState();

diff --git a/tests/integration/test_interaction_assessment.py b/tests/integration/test_interaction_assessment.py
@@ -189,14 +189,25 @@ def test_show_answer(self):
         show_answer_button = self._get_show_answer_button()
         self.assertTrue(show_answer_button.is_displayed())
 
-        self.place_item(0, TOP_ZONE_ID)
-        for _ in xrange(self.MAX_ATTEMPTS):
+        self.place_item(0, TOP_ZONE_ID, Keys.RETURN)
+        for _ in xrange(self.MAX_ATTEMPTS-1):
             self.assertEqual(show_answer_button.get_attribute('disabled'), 'true')
             self.click_submit()
 
+        # Place an incorrect item on the final attempt.
+        self.place_item(1, TOP_ZONE_ID, Keys.RETURN)
+        self.click_submit()
+
+        # A feedback popup should open upon final submission.
+        popup = self._get_popup()
+        self.assertTrue(popup.is_displayed())
+
         self.assertIsNone(show_answer_button.get_attribute('disabled'))
         self.click_show_answer()
 
+        # The popup should be closed upon clicking Show Answer.
+        self.assertFalse(popup.is_displayed())
+
         self.assertEqual(show_answer_button.get_attribute('disabled'), 'true')
         self._assert_show_answer_item_placement()