Fix contract inclusion #43
Conversation
|
What was broken? |
| 'date' => { | ||
| 'type' => 'object', | ||
| 'properties' => { | ||
| 'milis' => { 'type' => 'number' } |
| @@ -125,16 +125,10 @@ def schema_contains?(options) | |||
|
|
|||
| # Check all publish types for a compatible consume type | |||
| publish_types.each do |publish_type| | |||
| compatible_consume_type_found = false | |||
| consume_types.each do |consume_type| | |||
| next unless publish_type == consume_type or | |||
There was a problem hiding this comment.
The or here looked wrong.
If you have two references like {'$ref' => '#/definitions/post' } it doesn't necessarily mean it's correct: The definition can be wrong in one of both sides. You need to ensure the type is fine
lib/lacerda/compare/json_schema.rb
Outdated
|
|
||
| unless compatible_consume_type_found | ||
| return _e(:ERR_MISSING_MULTI_PUBLISH_MULTI_CONSUME, location, publish_type) | ||
| matched = consume_types.any? do |consume_type| |
There was a problem hiding this comment.
The loop does the same, just looked a bit easier to understand
lib/lacerda/compare/json_schema.rb
Outdated
| @@ -175,11 +169,11 @@ def schema_contains?(options) | |||
| end | |||
|
|
|||
| if consume['type'] == 'array' | |||
| sorted_publish = publish['items'].sort | |||
There was a problem hiding this comment.
I didn't understand what was going on here. To me items looks pretty much like a oneOf, you need to find at least one match. I had some issues with multitype arrays, that's why I looked into it
There was a problem hiding this comment.
You need to find one, but not more than one (otherwise it would be anyOf)
| end | ||
| @errors.empty? | ||
|
|
||
| # Make sure required properties in consume are required in publish |
There was a problem hiding this comment.
Split the method, and added the required check here too. This makes this new spec pass, because before we just looked the required inside definitions
| @@ -233,7 +240,7 @@ def _e(error, location, extra = nil) | |||
| # | |||
| def data_for_pointer(data_or_pointer, schema) | |||
| data = nil | |||
| if data_or_pointer['type'] | |||
| if data_or_pointer['type'] || data_or_pointer['oneOf'] | |||
There was a problem hiding this comment.
Before we ignored the oneOfs. This caused errors with 'oneOf' => [ { "$ref" => "#/definitions/post"] } (added a test here). This is the way usually lacerda transforms references.
| @@ -23,15 +29,16 @@ | |||
| 'multi_props'=> { 'type'=>'array', 'items'=> [ { | |||
| 'oneOf' => [ | |||
| { 'type' => 'string' }, | |||
| { '$ref' => '#/definitions/post' } ] | |||
| { '$ref' => '#/definitions/date' } ] | |||
There was a problem hiding this comment.
When I wrote this test, I didn't notice that this was a post that could reference another post, kind of recursively. I've got some errors that were hard to track...so I just changed it for something a bit simpler.
* dont support items with an array of types * spacing
No description provided.