Add test for incrementing student attempts

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -643,7 +643,8 @@ class CombinedOpenEndedV1Module():
             if not self.ready_to_reset:
                 return self.out_of_sync_error(data)
 
-        if self.student_attempts > self.attempts:
+        self.student_attempts +=1
+        if self.student_attempts >= self.attempts:
             return {
                 'success': False,
                 # This is a student_facing_error
@@ -653,7 +654,6 @@ class CombinedOpenEndedV1Module():
                 ).format(self.student_attempts, self.attempts)
             }
         self.state = self.INITIAL
-        self.student_attempts +=1
         self.ready_to_reset = False
         for i in xrange(0, len(self.task_xml)):
             self.current_task_number = i

common/lib/xmodule/xmodule/tests/test_combined_open_ended.py

@@ -629,3 +629,54 @@ class OpenEndedModuleXmlTest(unittest.TestCase, DummyModulestore):
         #reset the problem
         module.handle_ajax("reset", {})
         self.assertEqual(module.state, "initial")
+
+class OpenEndedModuleXmlTest(unittest.TestCase, DummyModulestore):
+    """
+    Test the student flow in the combined open ended xmodule
+    """
+    problem_location = Location(["i4x", "edX", "open_ended", "combinedopenended", "SampleQuestion1Attempt"])
+    answer = "blah blah"
+    assessment = [0, 1]
+    hint = "blah"
+
+    def setUp(self):
+        self.test_system = get_test_system()
+        self.test_system.xqueue['interface'] = Mock(
+            send_to_queue=Mock(side_effect=[1, "queued"])
+        )
+        self.setup_modulestore(COURSE)
+
+    def test_reset_fail(self):
+        """
+       Test the flow of the module if we complete the self assessment step and then reset
+       @return:
+       """
+        assessment = [0, 1]
+        module = self.get_module_from_location(self.problem_location, COURSE)
+
+        #Simulate a student saving an answer
+        module.handle_ajax("save_answer", {"student_answer": self.answer})
+        status = module.handle_ajax("get_status", {})
+        self.assertTrue(isinstance(status, basestring))
+
+        #Mock a student submitting an assessment
+        assessment_dict = MockQueryDict()
+        assessment_dict.update({'assessment': sum(assessment), 'score_list[]': assessment})
+        module.handle_ajax("save_assessment", assessment_dict)
+        task_one_json = json.loads(module.task_states[0])
+        self.assertEqual(json.loads(task_one_json['child_history'][0]['post_assessment']), assessment)
+        status = module.handle_ajax("get_status", {})
+        self.assertTrue(isinstance(status, basestring))
+
+        #Move to the next step in the problem
+        module.handle_ajax("next_problem", {})
+        self.assertEqual(module.current_task_number, 0)
+
+        html = module.get_html()
+        self.assertTrue(isinstance(html, basestring))
+
+        rubric = module.handle_ajax("get_combined_rubric", {})
+        self.assertTrue(isinstance(rubric, basestring))
+        self.assertEqual(module.state, "done")
+        reset_data = json.loads(module.handle_ajax("reset", {}))
+        self.assertEqual(reset_data['success'], False)

common/test/data/open_ended/combinedopenended/SampleQuestion1Attempt.xml

@@ -0,0 +1,24 @@
+<combinedopenended attempts="1" display_name = "Humanities Question -- Machine Assessed">
+    <rubric>
+        <rubric>
+            <category>
+                <description>Writing Applications</description>
+                <option> The essay loses focus, has little information or supporting details, and the organization makes it difficult to follow.</option>
+                <option> The essay presents a mostly unified theme, includes sufficient information to convey the theme, and is generally organized well.</option>
+            </category>
+            <category>
+                <description> Language Conventions </description>
+                <option> The essay demonstrates a reasonable command of proper spelling and grammar. </option>
+                <option> The essay demonstrates superior command of proper spelling and grammar.</option>
+            </category>
+        </rubric>
+    </rubric>
+    <prompt>
+        <h4>Censorship in the Libraries</h4>
+        <p>"All of us can think of a book that we hope none of our children or any other children have taken off the shelf. But if I have the right to remove that book from the shelf -- that work I abhor -- then you also have exactly the same right and so does everyone else. And then we have no books left on the shelf for any of us." --Katherine Paterson, Author</p>
+        <p>Write a persuasive essay to a newspaper reflecting your vies on censorship in libraries. Do you believe that certain materials, such as books, music, movies, magazines, etc., should be removed from the shelves if they are found offensive? Support your position with convincing arguments from your own experience, observations, and/or reading.</p>
+    </prompt>
+    <task>
+        <selfassessment/>
+    </task>
+</combinedopenended>

common/test/data/open_ended/course/2012_Fall.xml

@@ -1,6 +1,7 @@
 <course>
   <chapter url_name="Overview">
     <combinedopenended url_name="SampleQuestion"/>
+    <combinedopenended url_name="SampleQuestion1Attempt"/>
     <peergrading url_name="PeerGradingSample"/>
     <peergrading url_name="PeerGradingScored"/>
   </chapter>