Merge pull request #1108 from owenconti/bug/3376-properties-keyboard-fix

Fixes #3376 - Keyword properties fix
swagger-api · Jul 18, 2017 · 570013f · 570013f
2 parents f620497 + b00db53
commit 570013f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/specmap/index.js b/src/specmap/index.js
@@ -94,7 +94,10 @@ class SpecMap {
             }
           }
           else {
-            const parent = path[path.length - 1]
+            const parentIndex = path.length - 1
+            const parent = path[parentIndex]
+            const indexOfFirstProperties = path.indexOf('properties')
+            const isRootProperties = parent === 'properties' && parentIndex === indexOfFirstProperties
 
             for (const key of Object.keys(obj)) {
               const val = obj[key]
@@ -103,7 +106,8 @@ class SpecMap {
               if (lib.isObject(val)) {
                 yield* traverse(val, updatedPath, patch)
               }
-              if (parent !== 'properties' && key === pluginObj.key) {
+
+              if (!isRootProperties && key === pluginObj.key) {
                 yield pluginObj.plugin(val, key, updatedPath, specmap, patch)
               }
             }

diff --git a/test/specmap/index.js b/test/specmap/index.js
@@ -728,6 +728,38 @@ describe('specmap', function () {
           })
         })
       })
+
+      it('should merge sub-properties', function () {
+        return mapSpec({
+          plugins: [plugins.refs, plugins.allOf],
+          spec: {
+            properties: {
+              test: {
+                type: 'object',
+                properties: {
+                  color: {
+                    type: 'integer'
+                  }
+                }
+              }
+            }
+          }
+        }).then((res) => {
+          expect(res.errors.length).toEqual(0)
+          expect(res.spec).toEqual({
+            properties: {
+              test: {
+                type: 'object',
+                properties: {
+                  color: {
+                    type: 'integer'
+                  }
+                }
+              }
+            }
+          })
+        })
+      })
     })
 
     describe('context', function () {