Skip to content
This repository has been archived by the owner on Jul 2, 2019. It is now read-only.

Commit

Permalink
Merge pull request #110 from apiaryio/kylef/minim
Browse files Browse the repository at this point in the history 
Update fury to 3.0.0-beta.2
  • Loading branch information
@kylef
kylef authored Jul 4, 2017
2 parents 2fd6365 + 8ad3e13 commit d78a370
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 211 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Master
# 0.12.0-beta.3

- Updates to fury 3.0.0-beta.2.

## Bug Fixes

Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fury-adapter-swagger",
"version": "0.12.0-beta.2",
"version": "0.12.0-beta.3",
"description": "Swagger 2.0 parser for Fury.js",
"main": "./lib/adapter.js",
"tonicExampleFilename": "tonic-example.js",
Expand Down Expand Up @@ -28,12 +28,12 @@
"devDependencies": {
"babel-plugin-array-includes": "^2.0.3",
"chai": "^3.2.0",
"fury": "3.0.0-beta.0",
"fury": "3.0.0-beta.2",
"glob": "^7.1.1",
"minim": "^0.15.0",
"minim-parse-result": "^0.4.0",
"minim": "^0.17.1",
"minim-parse-result": "^0.6.1",
"peasant": "^1.1.0",
"swagger-zoo": "2.3.0"
"swagger-zoo": "2.3.1"
},
"engines": {
"node": ">=4"
Expand Down
4 changes: 2 additions & 2 deletions test/adapter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function testFixture(description, fixture, generateSourceMap = false) {

// Invoke with the env var GENERATE set to regenerate the fixtures.
if (process.env.GENERATE) {
expected = output.toRefract();
expected = fury.minim.toRefract(output);

if (generateSourceMap) {
// eslint-disable-next-line no-param-reassign
Expand All @@ -45,7 +45,7 @@ function testFixture(description, fixture, generateSourceMap = false) {
}
}

expect(output.toRefract()).to.deep.equal(expected);
expect(fury.minim.toRefract(output)).to.deep.equal(expected);
return done();
});
});
Expand Down
5 changes: 0 additions & 5 deletions test/fixtures/ast-path-with-reference-sibling.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"element": "parseResult",
"meta": {},
"attributes": {},
"content": [
{
"element": "annotation",
Expand All @@ -12,7 +10,6 @@
"links": [
{
"element": "link",
"meta": {},
"attributes": {
"relation": "origin",
"href": "http://docs.apiary.io/validations/swagger#swagger-validation"
Expand All @@ -26,8 +23,6 @@
"sourceMap": [
{
"element": "sourceMap",
"meta": {},
"attributes": {},
"content": [
[
247,
Expand Down
27 changes: 0 additions & 27 deletions test/fixtures/circular-example.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"element": "parseResult",
"meta": {},
"attributes": {},
"content": [
{
"element": "category",
Expand All @@ -20,18 +18,13 @@
"user"
]
},
"attributes": {},
"content": {
"key": {
"element": "string",
"meta": {},
"attributes": {},
"content": "HOST"
},
"value": {
"element": "string",
"meta": {},
"attributes": {},
"content": "petstore.swagger.io"
}
}
Expand All @@ -41,53 +34,38 @@
"content": [
{
"element": "resource",
"meta": {},
"attributes": {
"href": "/"
},
"content": [
{
"element": "transition",
"meta": {},
"attributes": {},
"content": [
{
"element": "httpTransaction",
"meta": {},
"attributes": {},
"content": [
{
"element": "httpRequest",
"meta": {},
"attributes": {
"method": "GET"
},
"content": []
},
{
"element": "httpResponse",
"meta": {},
"attributes": {
"headers": {
"element": "httpHeaders",
"meta": {},
"attributes": {},
"content": [
{
"element": "member",
"meta": {},
"attributes": {},
"content": {
"key": {
"element": "string",
"meta": {},
"attributes": {},
"content": "Content-Type"
},
"value": {
"element": "string",
"meta": {},
"attributes": {},
"content": "application/json"
}
}
Expand All @@ -99,8 +77,6 @@
"content": [
{
"element": "copy",
"meta": {},
"attributes": {},
"content": "Get company info"
}
]
Expand All @@ -122,7 +98,6 @@
"links": [
{
"element": "link",
"meta": {},
"attributes": {
"relation": "origin",
"href": "http://docs.apiary.io/validations/swagger#refract-not-supported"
Expand All @@ -136,8 +111,6 @@
"sourceMap": [
{
"element": "sourceMap",
"meta": {},
"attributes": {},
"content": [
[
231,
Expand Down
19 changes: 0 additions & 19 deletions test/fixtures/consumes-invalid-type.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"element": "parseResult",
"meta": {},
"attributes": {},
"content": [
{
"element": "category",
Expand All @@ -11,28 +9,21 @@
],
"title": "Consumes JSON with invalid content type"
},
"attributes": {},
"content": [
{
"element": "resource",
"meta": {},
"attributes": {
"href": "/test"
},
"content": [
{
"element": "transition",
"meta": {},
"attributes": {},
"content": [
{
"element": "httpTransaction",
"meta": {},
"attributes": {},
"content": [
{
"element": "httpRequest",
"meta": {},
"attributes": {
"method": "GET"
},
Expand All @@ -51,28 +42,21 @@
},
{
"element": "dataStructure",
"meta": {},
"attributes": {},
"content": {
"element": "object",
"meta": {},
"attributes": {},
"content": []
}
}
]
},
{
"element": "httpResponse",
"meta": {},
"attributes": {
"statusCode": "200"
},
"content": [
{
"element": "copy",
"meta": {},
"attributes": {},
"content": "My Response"
}
]
Expand All @@ -94,7 +78,6 @@
"links": [
{
"element": "link",
"meta": {},
"attributes": {
"relation": "origin",
"href": "http://docs.apiary.io/validations/swagger#swagger-validation"
Expand All @@ -108,8 +91,6 @@
"sourceMap": [
{
"element": "sourceMap",
"meta": {},
"attributes": {},
"content": [
[
101,
Expand Down
21 changes: 0 additions & 21 deletions test/fixtures/external-dereferencing.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"element": "parseResult",
"meta": {},
"attributes": {},
"content": [
{
"element": "category",
Expand All @@ -11,57 +9,41 @@
],
"title": "Dereferencing a local file"
},
"attributes": {},
"content": [
{
"element": "resource",
"meta": {},
"attributes": {
"href": "/"
},
"content": [
{
"element": "transition",
"meta": {},
"attributes": {},
"content": [
{
"element": "httpTransaction",
"meta": {},
"attributes": {},
"content": [
{
"element": "httpRequest",
"meta": {},
"attributes": {
"method": "GET"
},
"content": []
},
{
"element": "httpResponse",
"meta": {},
"attributes": {
"headers": {
"element": "httpHeaders",
"meta": {},
"attributes": {},
"content": [
{
"element": "member",
"meta": {},
"attributes": {},
"content": {
"key": {
"element": "string",
"meta": {},
"attributes": {},
"content": "Content-Type"
},
"value": {
"element": "string",
"meta": {},
"attributes": {},
"content": "application/json"
}
}
Expand All @@ -73,8 +55,6 @@
"content": [
{
"element": "copy",
"meta": {},
"attributes": {},
"content": "dereference package.json"
},
{
Expand All @@ -84,7 +64,6 @@
"messageBody"
]
},
"attributes": {},
"content": "{\n \"example\": {\n \"$ref\": \"package.json\"\n }\n}"
}
]
Expand Down
Loading

0 comments on commit d78a370

Please sign in to comment.