Fixed tests

Author: syrusakbary

graphene_django/converter.py

@@ -114,7 +114,10 @@ def dynamic_type():
         if not _type:
             return
 
-        return Field(_type, required=not field.null)
+        # We do this for a bug in Django 1.8, where null attr
+        # is not available in the OneToOneRel instance
+        null = getattr(field, 'null', True)
+        return Field(_type, required=not null)
 
     return Dynamic(dynamic_type)
 
@@ -149,7 +152,7 @@ def dynamic_type():
             return
 
         if isinstance(field.field, models.OneToOneField):
-            return Field(_type, required=not field.field.null)
+            return Field(_type)
 
         if is_node(_type):
             return get_connection_field(_type)

graphene_django/tests/test_converter.py

@@ -20,11 +20,17 @@
 
 
 def assert_conversion(django_field, graphene_field, *args, **kwargs):
-    field = django_field(help_text='Custom Help Text', *args, **kwargs)
+    field = django_field(help_text='Custom Help Text', null=True, *args, **kwargs)
     graphene_type = convert_django_field(field)
     assert isinstance(graphene_type, graphene_field)
     field = graphene_type.Field()
     assert field.description == 'Custom Help Text'
+    nonnull_field = django_field(null=False, *args, **kwargs)
+    if not nonnull_field.null:
+        nonnull_graphene_type = convert_django_field(nonnull_field)
+        nonnull_field = nonnull_graphene_type.Field()
+        assert isinstance(nonnull_field.type, graphene.NonNull)
+        return nonnull_field
     return field
 
 
@@ -226,8 +232,7 @@ class Meta:
     assert isinstance(graphene_field, graphene.Dynamic)
     dynamic_field = graphene_field.get_type()
     assert isinstance(dynamic_field, graphene.Field)
-    assert isinstance(dynamic_field.type, graphene.NonNull)
-    assert dynamic_field.of_type.type == A
+    assert dynamic_field.type == A
 
 
 @pytest.mark.skipif(ArrayField is MissingType,