Nearly working tests

Author: jtratner

graphene_django/forms/mutation.py

@@ -1,4 +1,5 @@
 # from django import forms
+import warnings
 from collections import OrderedDict
 
 import graphene
@@ -112,24 +113,27 @@ def __init_subclass_with_meta__(
             raise Exception("form_class is required for DjangoFormMutation")
 
         form = form_class()
-        if (any(only, exclude, input_fields)
+        if (any([fields, exclude, input_fields])
              and (only_fields or exclude_fields)):
             raise Exception("Cannot specify legacy `only_fields` or `exclude_fields` params with"
                             " `only`, `exclude`, or `input_fields` params")
         if only_fields or exclude_fields:
             warnings.warn(
-                DeprecationWarning,
                 "only_fields/exclude_fields have been deprecated, use "
                 "input_fields or only/exclude (for output fields)"
-                "instead"
+                "instead",
+                DeprecationWarning
             )
         if not fields or exclude:
             warnings.warn(
-                DeprecationWarning,
                 "a future version of graphene-django will require fields or exclude."
-                " Set fields='__all__' to allow all fields through."
+                " Set fields='__all__' to allow all fields through.",
+                DeprecationWarning
             )
-        input_fields = fields_for_form(form, only_fields or input_fields, exclude_fields)
+        if not input_fields and input_fields is not None:
+            input_fields = {}
+        else:
+            input_fields = fields_for_form(form, only_fields or input_fields, exclude_fields)
         output_fields = fields_for_form(form, only_fields or fields, exclude_fields or exclude)
 
         _meta = DjangoFormMutationOptions(cls)

graphene_django/forms/tests/test_mutation.py

@@ -3,7 +3,7 @@
 from django.core.exceptions import ValidationError
 from py.test import raises
 
-from graphene import ObjectType, Schema, String, Field
+from graphene import Int, ObjectType, Schema, String, Field
 from graphene_django import DjangoObjectType
 from graphene_django.tests.models import Film, Pet
 
@@ -13,16 +13,16 @@
 
 class MyForm(forms.Form):
     text = forms.CharField()
-    another = forms.CharField(required=False, default="defaultvalue")
+    another = forms.CharField(required=False)
 
     def clean_text(self):
         text = self.cleaned_data["text"]
         if text == "INVALID_INPUT":
             raise ValidationError("Invalid input")
         return text
 
-    def clean(self):
-        self.cleaned_data["some_integer"] = 5
+    def clean_another(self):
+        self.cleaned_data["another"] = self.cleaned_data["another"] or "defaultvalue"
 
     def save(self):
         pass
@@ -77,12 +77,13 @@ class Meta:
     assert "text" in MyMutation.Input._meta.fields
     assert "another" in MyMutation.Input._meta.fields
 
+
 def test_no_input_fields():
     class MyMutation(DjangoFormMutation):
         class Meta:
             form_class = MyForm
             input_fields = []
-    assert not  MyMutation.Input._meta.fields
+    assert set(MyMutation.Input._meta.fields.keys()) == set(["client_mutation_id"])
 
 
 def test_filtering_input_fields():
@@ -100,8 +101,8 @@ class MyMutation(DjangoFormMutation):
         class Meta:
             form_class = MyForm
             fields = ["text"]
-    assert "text" in MyMutation.Output._meta.fields
-    assert "another" not in MyMutation.Output._meta.fields
+    assert "text" in MyMutation._meta.fields
+    assert "another" not in MyMutation._meta.fields
 
 
 
@@ -183,16 +184,28 @@ class Mutation(ObjectType):
         self.assertEqual(result.data["myMutation"]["text"], "VALID_INPUT")
 
     def test_filtering_output_fields_exclude(self):
+        class FormWithWeirdOutput(MyForm):
+            """Weird form that has extra cleaned_data we want to expose"""
+            text = forms.CharField()
+            another = forms.CharField(required=False)
+            def clean(self):
+                super(FormWithWeirdOutput, self).clean()
+                self.cleaned_data["some_integer"] = 5
+                return self.cleaned_data
+
         class MyMutation(DjangoFormMutation):
             class Meta:
-                form_class = MyForm
+                form_class = FormWithWeirdOutput
                 exclude = ["text"]
 
-            some_integer = graphene.Int()
+            some_integer = Int()
 
-        assert "text" not in MyMutation.Output._meta.fields
-        assert "another" in MyMutation.Output._meta.fields
-        assert "some_integer" in MyMutation.Output._meta.fields
+        assert "text" in MyMutation.Input._meta.fields
+        assert "another" in MyMutation.Input._meta.fields
+
+        assert "text" not in MyMutation._meta.fields
+        assert "another" in MyMutation._meta.fields
+        assert "some_integer" in MyMutation._meta.fields
 
         class Mutation(ObjectType):
             my_mutation = MyMutation.Field()
@@ -207,16 +220,15 @@ class Mutation(ObjectType):
                         messages
                     }
                     another
-                    some_integer
+                    someInteger
                 }
             }
             """
         )
 
         self.assertIs(result.errors, None)
         self.assertEqual(result.data["myMutation"]["errors"], [])
-        self.assertEqual(result.data["myMutation"]["text"], "VALID_INPUT")
-        self.assertEqual(result.data["myMutation"]["some_integer"], 5)
+        self.assertEqual(result.data["myMutation"]["someInteger"], 5)
         self.assertEqual(result.data["myMutation"]["another"], "defaultvalue")