Merge pull request #459 from edx/will/TIM-659

Concatenate validation errors with semicolons instead of newlines so they show up correctly in Studio

openassessment/xblock/test/test_validation.py

@@ -304,7 +304,7 @@ class ValidationIntegrationTest(TestCase):
         # Expect a validation error
         is_valid, msg = self.validator(self.RUBRIC, self.SUBMISSION, mutated_assessments)
         self.assertFalse(is_valid)
-        self.assertEqual(msg, u'Example 1 has an extra option for "Invalid criterion!"\nExample 1 is missing an option for "vocabulary"')
+        self.assertEqual(msg, u'Example 1 has an extra option for "Invalid criterion!"; Example 1 is missing an option for "vocabulary"')
 
     def test_student_training_examples_invalid_option(self):
         # Mutate the assessment training examples so the option names don't match the rubric

openassessment/xblock/validation.py

@@ -278,7 +278,7 @@ def validate_assessment_examples(rubric_dict, assessments):
             # examples against the rubric.
             errors = validate_training_examples(rubric_dict, examples)
             if errors:
-                return False, "\n".join(errors)
+                return False, "; ".join(errors)
 
     return True, u''