Merge pull request #1209 from vega/vega-schema

kanitw · kanitw · commit 2f02e8391ce7 · 2016-03-01T13:32:14.000-08:00
Validate generated vega spec against vega schema + Update Vega
diff --git a/examples/examples.test.ts b/examples/examples.test.ts
@@ -22,7 +22,7 @@ function validateAgainstSchemas(vlspec) {
   }
   assert(isVlValid);
 
-  const vegaSpec = vl.compile(vlspec);
+  const vegaSpec = vl.compile(vlspec).spec;
 
   const isVgValid = validator.validate(vegaSpec, vgSchema);
   if (!isVgValid) {
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "typescript": "^1.8.2",
     "typescript-json-schema": "^0.0.8",
     "uglify-js": "^2.6.2",
-    "vega": "^2.5.0",
+    "vega": "^2.5.1",
     "vega-datasets": "vega/vega-datasets#gh-pages",
     "watchify": "^3.7.0",
     "z-schema": "^3.16.1"

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function validateAgainstSchemas(vlspec) {`
`22`	`22`	`}`
`23`	`23`	`assert(isVlValid);`
`24`	`24`
`25`		`- const vegaSpec = vl.compile(vlspec);`
	`25`	`+ const vegaSpec = vl.compile(vlspec).spec;`
`26`	`26`
`27`	`27`	`const isVgValid = validator.validate(vegaSpec, vgSchema);`
`28`	`28`	`if (!isVgValid) {`