Restoring feedback on reload for stadnard-mode mentoring + tests

problem_builder/public/js/mentoring_standard_view.js

@@ -28,8 +28,6 @@ function MentoringStandardView(runtime, element, mentoring) {
             messagesDOM.prepend('<div class="title1">' + gettext('Feedback') + '</div>');
             messagesDOM.show();
         }
-
-        submitDOM.attr('disabled', 'disabled');
     }
 
     function handleSubmitError(jqXHR, textStatus, errorThrown) {
@@ -45,12 +43,10 @@ function MentoringStandardView(runtime, element, mentoring) {
 
             mentoring.setContent(messagesDOM, errMsg);
             messagesDOM.show();
-
-            submitDOM.attr('disabled', 'disabled');
         }
     }
 
-    function calculate_results(handler_name) {
+    function calculate_results(handler_name, disable_submit) {
         var data = {};
         var children = mentoring.children;
         for (var i = 0; i < children.length; i++) {
@@ -64,14 +60,19 @@ function MentoringStandardView(runtime, element, mentoring) {
             submitXHR.abort();
         }
         submitXHR = $.post(handlerUrl, JSON.stringify(data)).success(handleSubmitResults).error(handleSubmitError);
+
+        if (disable_submit) {
+            var disable_submit_callback = function(){ submitDOM.attr('disabled', 'disabled'); };
+            submitXHR.success(disable_submit_callback).error(disable_submit_callback);
+        }
     }
 
     function get_results(){
-        calculate_results('get_results');
+        calculate_results('get_results', false);
     }
 
     function submit() {
-        calculate_results('submit');
+        calculate_results('submit', true);
     }
 
     function clearResults() {

problem_builder/tests/integration/base_test.py

@@ -85,6 +85,13 @@ class ProblemBuilderBaseTest(SeleniumXBlockTest, PopupCheckMixin):
         submit.click()
         self.wait_until_disabled(submit)
 
+    def click_choice(self, container, choice_text):
+        """ Click on the choice label with the specified text """
+        for label in container.find_elements_by_css_selector('.choices .choice label'):
+            if choice_text in label.text:
+                label.click()
+                break
+
 
 class MentoringBaseTest(SeleniumBaseTest, PopupCheckMixin):
     module_name = __name__

problem_builder/tests/integration/test_messages.py

@@ -50,13 +50,6 @@ class MessagesTest(ProblemBuilderBaseTest):
             message_text = message_text[8:].lstrip()
             self.assertEqual(MESSAGES[msg_type], message_text)
 
-    def click_choice(self, container, choice_text):
-        """ Click on the choice label with the specified text """
-        for label in container.find_elements_by_css_selector('.choices .choice label'):
-            if choice_text in label.text:
-                label.click()
-                break
-
     @ddt.data(
         ("One", COMPLETED),
         ("Two", COMPLETED),

problem_builder/tests/integration/test_questionnaire.py

@@ -24,7 +24,7 @@ import ddt
 from mock import patch, Mock
 
 from problem_builder import MentoringBlock
-from .base_test import MentoringBaseTest
+from .base_test import MentoringBaseTest, ProblemBuilderBaseTest
 
 
 # Classes ###########################################################
@@ -292,3 +292,35 @@ class QuestionnaireBlockAprosThemeTest(QuestionnaireBlockTest):
     Test MRQ/MCQ questions without the LMS theme which is on by default.
     """
     pass
+
+
+@ddt.ddt
+class ProblemBuilderQuestionnaireBlockTest(ProblemBuilderBaseTest):
+    def _get_choice_feedback_popup(self, mentoring, choice_index):
+        choices = mentoring.find_elements_by_css_selector(".choices-list .choice")
+        target_choice = choices[choice_index]
+
+        return target_choice.find_element_by_css_selector(".choice-tips")
+
+    def _get_messages_element(self, mentoring):
+        return mentoring.find_element_by_css_selector('.messages')
+
+    @ddt.data(("One", 0), ("Two", 1))
+    @ddt.unpack
+    def test_persists_feedback_on_page_reload(self, choice_value, choice_index):
+        mentoring = self.load_scenario("messages.xml", {"max_attempts": 1})
+
+        self.click_choice(mentoring, choice_value)
+        self.click_submit(mentoring)
+
+        feedback_popup = self._get_choice_feedback_popup(mentoring, choice_index)
+        messages = self._get_messages_element(mentoring)
+        self.assertTrue(feedback_popup.is_displayed())
+        self.assertTrue(messages.is_displayed())
+
+        # now, reload the page
+        mentoring = self.go_to_view("student_view")
+        feedback_popup = self._get_choice_feedback_popup(mentoring, choice_index)
+        messages = self._get_messages_element(mentoring)
+        self.assertTrue(feedback_popup.is_displayed())
+        self.assertTrue(messages.is_displayed())