Merge pull request #648 from python-openapi/fix/path-finder-returns-d…

…efault-server Path finder returns default server
python-openapi · Nov 28, 2023 · 116617d · 116617d
2 parents f2ed227 + 994b684
commit 116617d
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 6 deletions.
diff --git a/openapi_core/templating/paths/finders.py b/openapi_core/templating/paths/finders.py
@@ -101,8 +101,10 @@ def _get_servers_iter(
             servers = (
                 path.get("servers", None)
                 or operation.get("servers", None)
-                or self.spec.get("servers", [{"url": "/"}])
+                or self.spec.get("servers", None)
             )
+            if not servers:
+                servers = [SchemaPath.from_dict({"url": "/"})]
             for server in servers:
                 server_url_pattern = name.rsplit(path_result.resolved, 1)[0]
                 server_url = server["url"]

diff --git a/tests/unit/templating/test_paths_finders.py b/tests/unit/templating/test_paths_finders.py
@@ -170,19 +170,45 @@ def spec(self, info, paths):
 class BaseTestServerNotFound:
     @pytest.fixture
     def servers(self):
-        return []
+        return [
+            SchemaPath.from_dict(
+                {"url": "http://petstore.swagger.io/resource"}
+            )
+        ]
 
-    @pytest.mark.xfail(
-        reason="returns default server",
-    )
     def test_raises(self, finder):
         method = "get"
-        full_url = "http://petstore.swagger.io/resource"
+        full_url = "http://invalidserver/resource"
 
         with pytest.raises(ServerNotFound):
             finder.find(method, full_url)
 
 
+class BaseTestDefaultServer:
+    @pytest.fixture
+    def servers(self):
+        return []
+
+    def test_returns_default_server(self, finder, spec):
+        method = "get"
+        full_url = "http://petstore.swagger.io/resource"
+
+        result = finder.find(method, full_url)
+
+        path = spec / "paths" / self.path_name
+        operation = spec / "paths" / self.path_name / method
+        server = SchemaPath.from_dict({"url": "/"})
+        path_result = TemplateResult(self.path_name, {})
+        server_result = TemplateResult("/", {})
+        assert result == (
+            path,
+            operation,
+            server,
+            path_result,
+            server_result,
+        )
+
+
 class BaseTestOperationNotFound:
     @pytest.fixture
     def operations(self):
@@ -290,6 +316,15 @@ def test_raises(self, finder):
             finder.find(method, full_url)
 
 
+class TestSpecSimpleServerDefaultServer(
+    BaseTestDefaultServer,
+    BaseTestSpecServer,
+    BaseTestSimplePath,
+    BaseTestSimpleServer,
+):
+    pass
+
+
 class TestSpecSimpleServerServerNotFound(
     BaseTestServerNotFound,
     BaseTestSpecServer,
@@ -325,6 +360,15 @@ class TestSpecSimpleServerPathsNotFound(
     pass
 
 
+class TestOperationSimpleServerDefaultServer(
+    BaseTestDefaultServer,
+    BaseTestOperationServer,
+    BaseTestSimplePath,
+    BaseTestSimpleServer,
+):
+    pass
+
+
 class TestOperationSimpleServerServerNotFound(
     BaseTestServerNotFound,
     BaseTestOperationServer,
@@ -360,6 +404,15 @@ class TestOperationSimpleServerPathsNotFound(
     pass
 
 
+class TestPathSimpleServerDefaultServer(
+    BaseTestDefaultServer,
+    BaseTestPathServer,
+    BaseTestSimplePath,
+    BaseTestSimpleServer,
+):
+    pass
+
+
 class TestPathSimpleServerServerNotFound(
     BaseTestServerNotFound,
     BaseTestPathServer,
@@ -443,6 +496,15 @@ class TestPathSimpleServerVariablePathValid(
     pass
 
 
+class TestSpecVariableServerDefaultServer(
+    BaseTestDefaultServer,
+    BaseTestSpecServer,
+    BaseTestSimplePath,
+    BaseTestVariableServer,
+):
+    pass
+
+
 class TestSpecVariableServerServerNotFound(
     BaseTestServerNotFound,
     BaseTestSpecServer,
@@ -478,6 +540,15 @@ class TestSpecVariableServerPathsNotFound(
     pass
 
 
+class TestOperationVariableServerDefaultServer(
+    BaseTestDefaultServer,
+    BaseTestOperationServer,
+    BaseTestSimplePath,
+    BaseTestVariableServer,
+):
+    pass
+
+
 class TestOperationVariableServerServerNotFound(
     BaseTestServerNotFound,
     BaseTestOperationServer,
@@ -513,6 +584,15 @@ class TestOperationVariableServerPathsNotFound(
     pass
 
 
+class TestPathVariableServerDefaultServer(
+    BaseTestDefaultServer,
+    BaseTestPathServer,
+    BaseTestSimplePath,
+    BaseTestVariableServer,
+):
+    pass
+
+
 class TestPathVariableServerServerNotFound(
     BaseTestServerNotFound,
     BaseTestPathServer,