Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3d15d52

Browse files
pyup-botOliver Sauder
authored and
Oliver Sauder
committed
Update pytest from 4.1.1 to 4.2.0
1 parent 4865383 commit 3d15d52

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

‎example/tests/test_generic_viewset.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from example.tests import TestBase
55

66

7-
@override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize')
87
class GenericViewSet(TestBase):
98
"""
109
Test expected responses coming from a Generic ViewSet
@@ -36,7 +35,8 @@ def test_ember_expected_renderer(self):
3635
"""
3736
url = reverse('user-manual-resource-name', kwargs={'pk': self.miles.pk})
3837

39-
response = self.client.get(url)
38+
with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
39+
response = self.client.get(url)
4040
self.assertEqual(200, response.status_code)
4141

4242
expected = {
@@ -75,14 +75,15 @@ def test_default_validation_exceptions(self):
7575
}
7676
]
7777
}
78-
response = self.client.post('/identities', {
79-
'data': {
80-
'type': 'users',
81-
'attributes': {
82-
'email': 'bar', 'first_name': 'alajflajaljalajlfjafljalj'
78+
with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
79+
response = self.client.post('/identities', {
80+
'data': {
81+
'type': 'users',
82+
'attributes': {
83+
'email': 'bar', 'first_name': 'alajflajaljalajlfjafljalj'
84+
}
8385
}
84-
}
85-
})
86+
})
8687

8788
assert expected == response.json()
8889

‎example/tests/test_model_viewsets.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from example.tests import TestBase
88

99

10-
@override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize')
1110
class ModelViewSetTests(TestBase):
1211
"""
1312
Test usage with ModelViewSets, also tests pluralization, camelization,
@@ -26,7 +25,8 @@ def test_key_in_list_result(self):
2625
"""
2726
Ensure the result has a 'user' key since that is the name of the model
2827
"""
29-
response = self.client.get(self.list_url)
28+
with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
29+
response = self.client.get(self.list_url)
3030
self.assertEqual(response.status_code, 200)
3131

3232
user = get_user_model().objects.all()[0]
@@ -63,7 +63,8 @@ def test_page_two_in_list_result(self):
6363
"""
6464
Ensure that the second page is reachable and is the correct data.
6565
"""
66-
response = self.client.get(self.list_url, {'page[number]': 2})
66+
with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
67+
response = self.client.get(self.list_url, {'page[number]': 2})
6768
self.assertEqual(response.status_code, 200)
6869

6970
user = get_user_model().objects.all()[1]
@@ -102,7 +103,8 @@ def test_page_range_in_list_result(self):
102103
tests pluralization as two objects means it converts ``user`` to
103104
``users``.
104105
"""
105-
response = self.client.get(self.list_url, {'page[size]': 2})
106+
with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
107+
response = self.client.get(self.list_url, {'page[size]': 2})
106108
self.assertEqual(response.status_code, 200)
107109

108110
users = get_user_model().objects.all()
@@ -148,7 +150,8 @@ def test_key_in_detail_result(self):
148150
"""
149151
Ensure the result has a 'user' key.
150152
"""
151-
response = self.client.get(self.detail_url)
153+
with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
154+
response = self.client.get(self.detail_url)
152155
self.assertEqual(response.status_code, 200)
153156

154157
expected = {
@@ -199,7 +202,8 @@ def test_key_in_post(self):
199202
}
200203
}
201204

202-
response = self.client.put(self.detail_url, data=data)
205+
with override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize'):
206+
response = self.client.put(self.detail_url, data=data)
203207

204208
assert data == response.json()
205209

‎requirements-development.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ flake8==3.6.0
88
flake8-isort==2.6.0
99
isort==4.3.4
1010
mock==2.0.0
11-
pytest==4.1.1
11+
pytest==4.2.0
1212
pytest-cov==2.6.1
1313
pytest-django==3.4.5
1414
pytest-factoryboy==2.0.2

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /