Skip to content

Commit 04e9767

Browse files
committed
remove unneeded changes
1 parent 613fe7b commit 04e9767

File tree

1 file changed

+19
-23
lines changed

1 file changed

+19
-23
lines changed

tests/execution/test_middleware.py

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88
from graphql.type import GraphQLField, GraphQLObjectType, GraphQLSchema, GraphQLString
99

1010

11-
def _create_schema(
12-
tp: GraphQLObjectType, is_subscription: bool = False
13-
) -> GraphQLSchema:
14-
if is_subscription:
15-
noop_type = GraphQLObjectType(
16-
"Noop", {"noop": GraphQLField(GraphQLString, resolve=lambda *_: "noop")}
17-
)
18-
return GraphQLSchema(query=noop_type, subscription=tp)
19-
return GraphQLSchema(tp)
11+
def _create_subscription_schema(tp: GraphQLObjectType) -> GraphQLSchema:
12+
noop_type = GraphQLObjectType(
13+
"Noop", {"noop": GraphQLField(GraphQLString, resolve=lambda *_: "noop")}
14+
)
15+
return GraphQLSchema(query=noop_type, subscription=tp)
2016

2117

2218
def describe_middleware():
@@ -35,7 +31,7 @@ def field(self, _info):
3531

3632
middlewares = MiddlewareManager()
3733
result = execute(
38-
_create_schema(test_type), doc, Data(), middleware=middlewares
34+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
3935
)
4036

4137
assert result.data["field"] == "resolved" # type: ignore
@@ -64,7 +60,7 @@ def reverse_middleware(next_, *args, **kwargs):
6460

6561
middlewares = MiddlewareManager(reverse_middleware)
6662
result = execute(
67-
_create_schema(test_type), doc, Data(), middleware=middlewares
63+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
6864
)
6965

7066
assert result.data == {"first": "eno", "second": "owt"} # type: ignore
@@ -97,7 +93,7 @@ def capitalize_middleware(next_, *args, **kwargs):
9793

9894
middlewares = MiddlewareManager(reverse_middleware, capitalize_middleware)
9995
result = execute(
100-
_create_schema(test_type), doc, Data(), middleware=middlewares
96+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
10197
)
10298

10399
assert result.data == {"first": "Eno", "second": "Owt"} # type: ignore
@@ -127,7 +123,7 @@ async def reverse_middleware(next_, *args, **kwargs):
127123

128124
middlewares = MiddlewareManager(reverse_middleware)
129125
awaitable_result = execute(
130-
_create_schema(test_type), doc, Data(), middleware=middlewares
126+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
131127
)
132128
assert isinstance(awaitable_result, Awaitable)
133129
result = await awaitable_result
@@ -159,7 +155,7 @@ def resolve(self, next_, *args, **kwargs):
159155

160156
middlewares = MiddlewareManager(ReverseMiddleware())
161157
result = execute(
162-
_create_schema(test_type), doc, Data(), middleware=middlewares
158+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
163159
)
164160

165161
assert result.data == {"first": "eno", "second": "owt"} # type: ignore
@@ -202,13 +198,13 @@ def resolve(self, next_, *args, **kwargs):
202198

203199
middlewares = MiddlewareManager(reverse_middleware, CaptitalizeMiddleware())
204200
result = execute(
205-
_create_schema(test_type), doc, Data(), middleware=middlewares
201+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
206202
)
207203
assert result.data == {"field": "Devloser"} # type: ignore
208204

209205
middlewares = MiddlewareManager(CaptitalizeMiddleware(), reverse_middleware)
210206
result = execute(
211-
_create_schema(test_type), doc, Data(), middleware=middlewares
207+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
212208
)
213209
assert result.data == {"field": "devloseR"} # type: ignore
214210

@@ -235,15 +231,15 @@ async def test_resolve(self, next_, *args, **kwargs):
235231

236232
middlewares = MiddlewareManager(reverse_middleware, CaptitalizeMiddleware())
237233
awaitable_result = execute(
238-
_create_schema(test_type), doc, Data(), middleware=middlewares
234+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
239235
)
240236
assert isinstance(awaitable_result, Awaitable)
241237
result = await awaitable_result
242238
assert result.data == {"field": "Devloser"}
243239

244240
middlewares = MiddlewareManager(CaptitalizeMiddleware(), reverse_middleware)
245241
awaitable_result = execute(
246-
_create_schema(test_type), doc, Data(), middleware=middlewares
242+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
247243
)
248244
assert isinstance(awaitable_result, Awaitable)
249245
result = await awaitable_result
@@ -273,7 +269,7 @@ async def reverse_middleware(next_, value, info, **kwargs):
273269
return awaitable_maybe[::-1]
274270

275271
agen = subscribe(
276-
_create_schema(test_type, is_subscription=True),
272+
_create_subscription_schema(test_type),
277273
doc,
278274
middleware=MiddlewareManager(reverse_middleware),
279275
)
@@ -294,7 +290,7 @@ def field(self, _info):
294290
"TestType", {"field": GraphQLField(GraphQLString)}
295291
)
296292

297-
result = execute(_create_schema(test_type), doc, Data(), middleware=None)
293+
result = execute(GraphQLSchema(test_type), doc, Data(), middleware=None)
298294

299295
assert result.data["field"] == "resolved" # type: ignore
300296

@@ -310,7 +306,7 @@ def field(self, _info):
310306
"TestType", {"field": GraphQLField(GraphQLString)}
311307
)
312308

313-
result = execute(_create_schema(test_type), doc, Data(), middleware=[])
309+
result = execute(GraphQLSchema(test_type), doc, Data(), middleware=[])
314310

315311
assert result.data["field"] == "resolved" # type: ignore
316312

@@ -324,7 +320,7 @@ def bad_middleware_object():
324320
with pytest.raises(TypeError) as exc_info:
325321
# noinspection PyTypeChecker
326322
execute(
327-
_create_schema(test_type),
323+
GraphQLSchema(test_type),
328324
doc,
329325
None,
330326
middleware=cast(Middleware, {"bad": "value"}),
@@ -364,7 +360,7 @@ def resolve(self, next_, *args, **kwargs):
364360
middlewares = [LogMiddleware("A"), LogMiddleware("B"), LogMiddleware("C")]
365361

366362
result = execute(
367-
_create_schema(test_type), doc, Data(), middleware=middlewares
363+
GraphQLSchema(test_type), doc, Data(), middleware=middlewares
368364
)
369365
assert result.data == {"field": "resolved"} # type: ignore
370366

0 commit comments

Comments
 (0)