fixed #44 : added a non-regression test

src/test/resources/expected/asciidoc/polymorphism/definitions.adoc

@@ -32,7 +32,7 @@ _Discriminator_ : petType
 |===
 |Name|Description|Required|Schema|Default|Example
 |huntingSkill|The measured skill for hunting|true|enum (clueless, lazy, adventurous, aggressive)|lazy|
-|name||true|string||
+|name|conflicting property with inheriting model (issue #44)|false|string||
 |petType||true|string||
 |===
 
@@ -51,7 +51,7 @@ Collection parent type without discriminator
 
 [[_dog]]
 === Dog
-A representation of a dog with a conflicting discriminator
+A representation of a dog with an alternative discriminator
 
 [%hardbreaks]
 _Polymorphism_ : Inheritance

src/test/resources/json/swagger_polymorphism.json

@@ -79,6 +79,10 @@
         {
           "type": "object",
           "properties": {
+            "name": {
+              "type": "string",
+              "description": "conflicting property with inheriting model (issue #44)"
+            },
             "huntingSkill": {
               "type": "string",
               "description": "The measured skill for hunting",
@@ -98,7 +102,7 @@
       ]
     },
     "Dog": {
-      "description": "A representation of a dog with a conflicting discriminator",
+      "description": "A representation of a dog with an alternative discriminator",
       "allOf": [
         {
           "$ref": "#/definitions/Pet"