Merge pull request #596 from edx/will/ora-782

Skip validation for assessment views that are disabled

openassessment/xblock/static/js/spec/studio/oa_edit_settings.js

@@ -161,10 +161,28 @@ describe("OpenAssessment.EditSettingsView", function() {
         // Simulate one of the assessment views being invalid
         assessmentViews[PEER].isValid = false;
         assessmentViews[PEER].setValidationErrors(["test error"]);
+        assessmentViews[PEER].isEnabled(true);
 
         // Expect that the parent view is also invalid
         expect(view.validate()).toBe(false);
-        debugger;
         expect(view.validationErrors()).toContain("test error");
     });
+
+    it("validates only assessments that are enabled", function() {
+        // Simulate one of the assessment views being invalid but disabled
+        assessmentViews[PEER].isValid = false;
+        assessmentViews[PEER].setValidationErrors(["test error"]);
+        assessmentViews[PEER].isEnabled(false);
+
+        // Spy on the assessment view's validate() method so we can
+        // verify that it doesn't get called (thus marking the DOM)
+        spyOn(assessmentViews[PEER], 'validate').andCallThrough();
+
+        // Expect that the parent view is still valid
+        expect(view.validate()).toBe(true);
+
+        // Check that the assessment view didn't get a chance
+        // to mark anything as invalid
+        expect(assessmentViews[PEER].validate).not.toHaveBeenCalled();
+    });
 });

openassessment/xblock/static/js/src/studio/oa_edit_settings.js

@@ -213,9 +213,11 @@ OpenAssessment.EditSettingsView.prototype = {
         isValid = (this.startDatetimeControl.validate() && isValid);
         isValid = (this.dueDatetimeControl.validate() && isValid);
 
-        // Validate each of the assessment views
+        // Validate each of the *enabled* assessment views
         $.each(this.assessmentViews, function() {
-            isValid = (this.validate() && isValid);
+            if (this.isEnabled()) {
+                isValid = (this.validate() && isValid);
+            }
         });
 
         return isValid;