Skip to content

Commit 5935f77

Browse files
author
Joel Collins
committed
Moved empty view_cls to conftest
1 parent 9bd34e1 commit 5935f77

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

tests/conftest.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@
44
from apispec.ext.marshmallow import MarshmallowPlugin
55

66

7+
@pytest.fixture
8+
def view_cls():
9+
class ViewClass:
10+
def get(self):
11+
pass
12+
13+
def post(self):
14+
pass
15+
16+
def put(self):
17+
pass
18+
19+
def delete(self):
20+
pass
21+
22+
return ViewClass
23+
24+
725
@pytest.fixture
826
def spec():
927
return APISpec(

tests/test_server_spec_utilities.py

Lines changed: 17 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,45 @@
44
import pytest
55

66

7-
@pytest.fixture
8-
def view_class():
9-
class ViewClass:
10-
def get(self):
11-
pass
12-
13-
def post(self):
14-
pass
15-
16-
def put(self):
17-
pass
18-
19-
def delete(self):
20-
pass
21-
22-
return ViewClass
23-
24-
25-
def test_initial_update_spec(view_class):
7+
def test_initial_update_spec(view_cls):
268
initial_spec = {"key": "value"}
27-
utilities.update_spec(view_class, initial_spec)
9+
utilities.update_spec(view_cls, initial_spec)
2810

29-
assert view_class.__apispec__ == initial_spec
11+
assert view_cls.__apispec__ == initial_spec
3012

3113

32-
def test_update_spec(view_class):
14+
def test_update_spec(view_cls):
3315
initial_spec = {"key": {"subkey": "value"}}
34-
utilities.update_spec(view_class, initial_spec)
16+
utilities.update_spec(view_cls, initial_spec)
3517

3618
new_spec = {"key": {"new_subkey": "new_value"}}
37-
utilities.update_spec(view_class, new_spec)
19+
utilities.update_spec(view_cls, new_spec)
3820

39-
assert view_class.__apispec__ == {
21+
assert view_cls.__apispec__ == {
4022
"key": {"subkey": "value", "new_subkey": "new_value"}
4123
}
4224

4325

44-
def test_get_spec(view_class):
26+
def test_get_spec(view_cls):
4527
assert utilities.get_spec(None) == {}
46-
assert utilities.get_spec(view_class) == {}
28+
assert utilities.get_spec(view_cls) == {}
4729

4830
initial_spec = {"key": {"subkey": "value"}}
49-
view_class.__apispec__ = initial_spec
31+
view_cls.__apispec__ = initial_spec
5032

51-
assert utilities.get_spec(view_class) == initial_spec
33+
assert utilities.get_spec(view_cls) == initial_spec
5234

5335

54-
def test_get_topmost_spec_attr(view_class):
55-
assert not utilities.get_topmost_spec_attr(view_class, "key")
36+
def test_get_topmost_spec_attr(view_cls):
37+
assert not utilities.get_topmost_spec_attr(view_cls, "key")
5638

5739
# Root value missing, fall back to GET
58-
view_class.get.__apispec__ = {"key": "get_value"}
59-
assert utilities.get_topmost_spec_attr(view_class, "key") == "get_value"
40+
view_cls.get.__apispec__ = {"key": "get_value"}
41+
assert utilities.get_topmost_spec_attr(view_cls, "key") == "get_value"
6042

6143
# Root value present, return root value
62-
view_class.__apispec__ = {"key": "class_value"}
63-
assert utilities.get_topmost_spec_attr(view_class, "key") == "class_value"
44+
view_cls.__apispec__ = {"key": "class_value"}
45+
assert utilities.get_topmost_spec_attr(view_cls, "key") == "class_value"
6446

6547

6648
def test_convert_schema_none(spec):

0 commit comments

Comments
 (0)