From d6dbe2a4a81dd069d12bfb75f8e997f8105d7335 Mon Sep 17 00:00:00 2001 From: Grant McConnaughey Date: Wed, 29 Nov 2017 14:20:56 -0600 Subject: [PATCH] Default return_field_name is camcelcased --- graphene_django/forms/mutation.py | 6 +++++- graphene_django/forms/tests/test_mutation.py | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/graphene_django/forms/mutation.py b/graphene_django/forms/mutation.py index 876e76a..58e0075 100644 --- a/graphene_django/forms/mutation.py +++ b/graphene_django/forms/mutation.py @@ -131,7 +131,11 @@ class DjangoModelFormMutation(BaseDjangoFormMutation): registry = get_global_registry() model_type = registry.get_type_for_model(model) - return_field_name = return_field_name or model._meta.model_name + return_field_name = return_field_name + if not return_field_name: + model_name = model.__name__ + return_field_name = model_name[:1].lower() + model_name[1:] + output_fields = OrderedDict() output_fields[return_field_name] = graphene.Field(model_type) diff --git a/graphene_django/forms/tests/test_mutation.py b/graphene_django/forms/tests/test_mutation.py index 5876405..3bfb883 100644 --- a/graphene_django/forms/tests/test_mutation.py +++ b/graphene_django/forms/tests/test_mutation.py @@ -2,7 +2,7 @@ from django import forms from django.test import TestCase from py.test import raises -from graphene_django.tests.models import Pet, Film +from graphene_django.tests.models import Pet, Film, FilmDetails from ..mutation import DjangoFormMutation, DjangoModelFormMutation @@ -52,6 +52,15 @@ class ModelFormMutationTests(TestCase): self.assertEqual(PetMutation._meta.return_field_name, 'pet') self.assertIn('pet', PetMutation._meta.fields) + def test_return_field_name_is_camelcased(self): + class PetMutation(DjangoModelFormMutation): + class Meta: + form_class = PetForm + model = FilmDetails + + self.assertEqual(PetMutation._meta.model, FilmDetails) + self.assertEqual(PetMutation._meta.return_field_name, 'filmDetails') + def test_custom_return_field_name(self): class PetMutation(DjangoModelFormMutation): class Meta: