Commit af54109

committed

Fix merge

1 parent f7861ff commit af54109Copy full SHA for af54109

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`from example.tests import TestBase`
`5`	`5`
`6`		`-`
`7`	`6`	`@override_settings(JSON_API_FORMAT_FIELD_NAMES='dasherize')`
`8`	`7`	`class GenericViewSet(TestBase):`
`9`	`8`	`"""`
`@@ -114,7 +113,6 @@ def test_custom_validation_exceptions(self):`
`114`	`113`	`}`
`115`	`114`	`}`
`116`	`115`	`})`
`117`		`-`
`118`	`116`	`assert expected == response.json()`
`119`	`117`
`120`	`118`	`def test_validation_exceptions_with_included(self):`
`@@ -128,7 +126,7 @@ def test_validation_exceptions_with_included(self):`
`128`	`126`	`},`
`129`	`127`	`'detail': 'This field is required.',`
`130`	`128`	`}`
`131`		`- response = self.client.post('/entries', dump_json({`
	`129`	`+ response = self.client.post('/entries', {`
`132`	`130`	`'data': {`
`133`	`131`	`'type': 'posts',`
`134`	`132`	`'id': 1,`
`@@ -169,7 +167,7 @@ def test_validation_exceptions_with_included(self):`
`169`	`167`	`},`
`170`	`168`	`},`
`171`	`169`	`]`
`172`		`- }), content_type='application/vnd.api+json')`
	`170`	`+ })`
`173`	`171`
`174`		`- assert expected_error in json.loads(response.content)['errors']`
	`172`	`+ assert expected_error in response.json()['errors']`
`175`	`173`

Comments

(0)