chore: Loaders unification

schemathesis · Apr 2, 2021 · a2d9beb · a2d9beb
1 parent 36c0c87
commit a2d9beb
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 63 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -12,6 +12,22 @@ Changelog
 - Support for ``data_generation_methods`` and ``code_sample_style`` in all GraphQL loaders.
 - Support for ``app`` & ``base_url`` arguments for the ``from_pytest_fixture`` runner.
 
+**Breaking**
+
+- Loaders' signatures are unified. Most of the arguments became keyword-only. All except the first two for ASGI/WSGI, all except the first one for the others.
+  It forces loader calls to be more consistent.
+
+.. code-block:: python
+
+    # BEFORE
+    schema = schemathesis.from_uri(
+        "http://example.com/openapi.json", "http://127.0.0.1:8000/", "GET"
+    )
+    # NOW
+    schema = schemathesis.from_uri(
+        "http://example.com/openapi.json", base_url="http://127.0.0.1:8000/", method="GET"
+    )
+
 **Changed**
 
 - Schemathesis generates separate tests for each field defined in the GraphQL ``Query`` type. It makes the testing process
@@ -29,6 +45,7 @@ Changelog
 - Silently ignoring some incorrect usages of ``@schema.given``.
 - Fixups examples were using incorrect fixup name.
 - Return type of ``make_case`` for GraphQL schemas.
+- Missed ``operation_id`` argument in ``from_asgi`` loader.
 
 `3.5.3`_ - 2021-03-27
 ---------------------

diff --git a/src/schemathesis/specs/graphql/loaders.py b/src/schemathesis/specs/graphql/loaders.py
@@ -99,10 +99,10 @@
 
 def from_url(
     url: str,
-    base_url: Optional[str] = None,
-    port: Optional[int] = None,
     *,
     app: Any = None,
+    base_url: Optional[str] = None,
+    port: Optional[int] = None,
     data_generation_methods: Iterable[DataGenerationMethod] = DEFAULT_DATA_GENERATION_METHODS,
     code_sample_style: str = CodeSampleStyle.default().name,
     **kwargs: Any,
@@ -135,12 +135,12 @@ def from_url(
 
 def from_dict(
     raw_schema: Dict[str, Any],
-    location: Optional[str] = None,
-    base_url: Optional[str] = None,
     *,
+    app: Any = None,
+    base_url: Optional[str] = None,
+    location: Optional[str] = None,
     data_generation_methods: Iterable[DataGenerationMethod] = DEFAULT_DATA_GENERATION_METHODS,
     code_sample_style: str = CodeSampleStyle.default().name,
-    app: Any = None,
 ) -> GraphQLSchema:
     """Load GraphQL schema from a Python dictionary.
 
@@ -158,6 +158,7 @@ def from_dict(
 def from_wsgi(
     schema_path: str,
     app: Any,
+    *,
     base_url: Optional[str] = None,
     data_generation_methods: Iterable[DataGenerationMethod] = DEFAULT_DATA_GENERATION_METHODS,
     code_sample_style: str = CodeSampleStyle.default().name,
@@ -189,6 +190,7 @@ def from_wsgi(
 def from_asgi(
     schema_path: str,
     app: Any,
+    *,
     base_url: Optional[str] = None,
     data_generation_methods: Iterable[DataGenerationMethod] = DEFAULT_DATA_GENERATION_METHODS,
     code_sample_style: str = CodeSampleStyle.default().name,