Merge 90320dc into 7499697

cybertk · Jul 14, 2015 · 6fdd641 · 6fdd641
2 parents 7499697 + 90320dc
commit 6fdd641
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/add-tests.coffee b/src/add-tests.coffee
@@ -78,11 +78,9 @@ addTests = (raml, tests, parent, callback) ->
 
         # Update test.response
         test.response.status = status
-        test.response.schema = []
-        if (raml.schemas)
-          test.response.schema = raml.schemas
+        test.response.schema = null
         if (res?.body?['application/json']?.schema)
-          test.response.schema.push parseSchema res.body['application/json'].schema
+          test.response.schema = parseSchema res.body['application/json'].schema
 
       callback()
     , (err) ->

diff --git a/test/unit/add-tests-test.coffee b/test/unit/add-tests-test.coffee
@@ -56,7 +56,7 @@ describe '#addTests', ->
         res = tests[0].response
 
         assert.equal res.status, 200
-        schema = res.schema[0]
+        schema = res.schema
         assert.equal schema.items.properties.type.type, 'string'
         assert.equal schema.items.properties.name.type, 'string'
         assert.isNull res.headers
@@ -102,7 +102,7 @@ describe '#addTests', ->
         res = tests[1].response
 
         assert.equal res.status, 201
-        schema = res.schema[0]
+        schema = res.schema
         assert.equal schema.properties.type.type, 'string'
         assert.equal schema.properties.name.type, 'string'
         assert.isNull res.headers
@@ -147,7 +147,7 @@ describe '#addTests', ->
         res = tests[0].response
 
         assert.equal res.status, 200
-        assert.lengthOf res.schema, 3
+        assert.equal res.schema?.properties?.chick?.type, "string"
         assert.isNull res.headers
         assert.isNull res.body
 
@@ -190,8 +190,7 @@ describe '#addTests', ->
         res = tests[0].response
 
         assert.equal res.status, 200
-        # console.log res.schema
-        assert.lengthOf res.schema, 3
+        assert.equal res.schema?.properties?.type["$ref"], "type2"
         assert.isNull res.headers
         assert.isNull res.body