Raise a custom ValidationError, including the archives URI (if set).

jarib · Jan 9, 2011 · 26cdab3 · 26cdab3
1 parent 82567d5
commit 26cdab3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/har/archive.rb b/lib/har/archive.rb
@@ -61,6 +61,13 @@ def valid?
 
     def validate!
       JSON::Validator.validate2 schema_file, @input
+    rescue JSON::ValidationError => ex
+      # add archive uri to the message
+      if @uri
+        raise ValidationError, "#{@uri}: #{ex.message}"
+      else
+        raise ValidationError, ex.message
+      end
     end
 
     protected

diff --git a/spec/har/archive_spec.rb b/spec/har/archive_spec.rb
@@ -109,7 +109,7 @@ module HAR
       end
 
       it "raises an error if the archive is invalid" do
-        lambda { invalid.validate! }.should raise_error(JSON::ValidationError)
+        lambda { invalid.validate! }.should raise_error(ValidationError, /bad\.har/)
       end
     end