Merge pull request #229 from macisamuele/maci-fix-tests-due-to-bravad…

…o-core-update Fix tests due to bravado core update
Yelp · May 22, 2018 · 2b91cb0 · 2b91cb0
2 parents 9ae382b + 4222a8b
commit 2b91cb0
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 69 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ dist/
 pyramid_swagger.egg-info
 tests/__pycache__
 venv/
+.pytest_cache/
diff --git a/tests/api_test.py b/tests/api_test.py
@@ -111,17 +111,3 @@ def test_extenal_refs_no_empty_keys():
     spec = Spec.from_dict(spec_dict, path)
     flattened_spec = spec.flattened_spec
     traverse_spec(flattened_spec)
-
-
-def test_extenal_conflicting_namespaces():
-    """
-    This test ensures that we dont overwrite
-    keys in defs_dict if multiple files have
-    an object with the same name.
-    """
-    with open('tests/sample_schemas/conflicting_namespaces/swagger.json') as swagger_spec:
-        spec_dict = yaml.load(swagger_spec)
-    path = 'file:' + os.getcwd() + '/tests/sample_schemas/conflicting_namespaces/swagger.json'
-    spec = Spec.from_dict(spec_dict, path)
-    flattened_spec = spec.flattened_spec
-    assert len(flattened_spec['definitions']) == 4
diff --git a/tests/sample_schemas/conflicting_namespaces/bar.json b/tests/sample_schemas/conflicting_namespaces/bar.json
diff --git a/tests/sample_schemas/conflicting_namespaces/foo.json b/tests/sample_schemas/conflicting_namespaces/foo.json
diff --git a/tests/sample_schemas/conflicting_namespaces/swagger.json b/tests/sample_schemas/conflicting_namespaces/swagger.json
diff --git a/tests/sample_schemas/recursive_app/external/external.json b/tests/sample_schemas/recursive_app/external/external.json
@@ -13,6 +13,7 @@
           "$ref":"#/widget"
         }
       }
-    }
+    },
+    "type": "object"
   }
 }
diff --git a/tests/sample_schemas/recursive_app/internal/swagger.json b/tests/sample_schemas/recursive_app/internal/swagger.json
@@ -20,7 +20,8 @@
             "$ref":"#/definitions/widget"
           }
         }
-      }
+      },
+      "type": "object"
     }
   },
   "paths": {