Merge pull request #3 from apiaryio/zdne/protagonist-0.18.3

Update to latest protagonist
apiaryio · Feb 3, 2015 · e899d5f · e899d5f
2 parents 41e7f6a + de13b11
commit e899d5f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "coffee-script": "~1.7.1",
     "yargs": "~1.3.3",
-    "protagonist-experimental": "~0.18.1",
+    "protagonist-experimental": "0.18.3",
     "boutique": "git+ssh://[email protected]:apiaryio/boutique.git"
   },
   "devDependencies": {

diff --git a/test/fixtures/blueprint.parseresult+sourcemap.json b/test/fixtures/blueprint.parseresult+sourcemap.json
@@ -35,7 +35,15 @@
                         "headers": [],
                         "attributes": {},
                         "body": "Hello World!\n",
-                        "schema": ""
+                        "schema": "",
+                        "assets": {
+                          "body": {
+                              "source": "Hello World!\n"
+                          },
+                          "schema": {
+                              "source": ""
+                          }
+                        }
                       }
                     ]
                   }

diff --git a/test/fixtures/blueprint.parseresult.json b/test/fixtures/blueprint.parseresult.json
@@ -35,7 +35,15 @@
                         "headers": [],
                         "attributes": {},
                         "body": "Hello World!\n",
-                        "schema": ""
+                        "schema": "",
+                        "assets": {
+                          "body": {
+                              "source": "Hello World!\n"
+                          },
+                          "schema": {
+                              "source": ""
+                          }
+                        }
                       }
                     ]
                   }

diff --git a/test/integration/cli-test.coffee b/test/integration/cli-test.coffee
@@ -41,10 +41,9 @@ describe 'Command line interface', () ->
 
     it 'stdout should contain the parse result fixture', () ->
       ast_fixture = require '../fixtures/blueprint.parseresult.json'
-      expected = JSON.stringify ast_fixture, null, 2
-      expected += '\n'
+      parsedStdout = JSON.parse stdout
 
-      assert.equal stdout, expected
+      assert.deepEqual parsedStdout, ast_fixture
 
   describe 'parsing blueprint with source map', () ->
     before (done) ->
@@ -57,10 +56,9 @@ describe 'Command line interface', () ->
 
     it 'stdout should contain the source map parser result fixture', () ->
       ast_fixture = require '../fixtures/blueprint.parseresult+sourcemap.json'
-      expected = JSON.stringify ast_fixture, null, 2
-      expected += '\n'
+      parsedStdout = JSON.parse stdout
 
-      assert.equal stdout, expected
+      assert.deepEqual parsedStdout, ast_fixture
 
   describe 'parsing invalid blueprint', () ->
     before (done) ->