fixup! Move footer buttons from user-match-question

src/common/components/userMatchModal/userMatchModal.component.js

@@ -164,6 +164,8 @@ class UserMatchModalController {
 
   // Request that the user-match-question component submit the form because the user clicked next
   requestAnswerSubmit () {
+    // Changing this will trigger $onChanges in user-match-question, which will ultimately call
+    // onQuestionAnswer in this controller
     this.answerSubmitted = true
   }
 
@@ -184,6 +186,8 @@ class UserMatchModalController {
   }
 
   onQuestionAnswer (success, question, answer) {
+    // If the user-match-question selection was invalid, success will be false, but we still need to
+    // reset answerSubmitted so that we can set it to true later when the user tries to submit again
     this.answerSubmitted = false
     if (!success) {
       return

src/common/components/userMatchModal/userMatchQuestion/userMatchQuestion.component.js

@@ -46,6 +46,9 @@ export default angular
       questionCount: '<',
       // Set to true from the parent to cause the form to submit and call onSubmit if it is valid
       submitted: '<',
+      // Called with a `success` boolean to indicate whether the selection was valid
+      // If the selection is valid, it is also called with `question` set to the current question
+      // and `answer` set to the selected answer
       onQuestionAnswer: '&'
     }
   })

src/common/components/userMatchModal/userMatchQuestion/userMatchQuestion.component.spec.js

@@ -33,13 +33,21 @@ describe('userMatchQuestion', function () {
       expect($ctrl.answer).toEqual('new answer')
     })
 
-    it('submits the form', () => {
+    it('submits the form when submitted changes to true', () => {
       $ctrl.$onChanges({
         submitted: { currentValue: true }
       })
 
       expect($ctrl.onQuestionAnswer).toHaveBeenCalled()
     })
+
+    it('does nothing when the when submitted changes to false', () => {
+      $ctrl.$onChanges({
+        submitted: { currentValue: false }
+      })
+
+      expect($ctrl.onQuestionAnswer).not.toHaveBeenCalled()
+    })
   })
 
   describe('selectAnswer()', () => {