Merge pull request #31 from graphql-python/test-increase-coverage

Test: Increase coverage

Author: abawchen

graphene_mongo/fields.py

@@ -92,10 +92,6 @@ def get_reference_field(r, kv):
             return r
         return reduce(get_reference_field, self.fields.items(), {})
 
-    @property
-    def filter_fields(self):
-        return self._type._meta.filter_fields
-
     @property
     def fields(self):
         return self._type._meta.fields
@@ -139,7 +135,7 @@ def get_query(cls, model, info, **args):
             if before is not None:
                 _before = int(from_global_id(before)[-1])
                 objs = objs[:_before]
-            # Not sure if this is in the correct place yet
+
             list_length = objs.count()
 
             if first is not None:

graphene_mongo/tests/fixtures.py

@@ -1,6 +1,6 @@
 from .models import (
     Article, Editor, EmbeddedArticle, Player,
-    Reporter, Parent, Child
+    Reporter, Child
 )
 
 

graphene_mongo/tests/models.py

@@ -19,6 +19,7 @@ class Editor(Document):
     last_name = StringField(required=True)
     metadata = MapField(field=StringField())
 
+
 class Pet(Document):
 
     meta = {'collection': 'test_pet'}
@@ -79,4 +80,3 @@ class Child(Parent):
 
     meta = {'collection': 'Child'}
     baz = StringField()
-

graphene_mongo/tests/test_converter.py

@@ -1,6 +1,5 @@
 import graphene
 import mongoengine
-import pytest
 
 from graphene import Dynamic
 from graphene import Node
@@ -9,6 +8,7 @@
 
 from .models import Article, Editor, EmbeddedArticle, Player, Reporter
 
+from .. import registry
 from ..converter import convert_mongoengine_field
 from ..fields import MongoengineConnectionField
 from ..types import MongoengineObjectType
@@ -21,6 +21,7 @@ def assert_conversion(mongoengine_field, graphene_field, *args, **kwargs):
     field = graphene_type.Field()
     return field
 
+
 def test_should_unknown_mongoengine_field_raise_exception():
     with raises(Exception) as excinfo:
         convert_mongoengine_field(None)
@@ -43,6 +44,10 @@ def test_should_uuid_convert_id():
     assert_conversion(mongoengine.UUIDField, graphene.ID)
 
 
+def test_sould_int_convert_int():
+    assert_conversion(mongoengine.IntField, graphene.Int)
+
+
 def test_should_object_id_convert_id():
     assert_conversion(mongoengine.ObjectIdField, graphene.ID)
 
@@ -83,21 +88,32 @@ class Meta:
             model = Editor
             interfaces = (Node,)
 
-    dynamic_field = convert_mongoengine_field(EmbeddedArticle._fields['editor'], E._meta.registry)
+    dynamic_field = convert_mongoengine_field(
+        EmbeddedArticle._fields['editor'], E._meta.registry)
     assert isinstance(dynamic_field, Dynamic)
     graphene_type = dynamic_field.get_type()
     assert isinstance(graphene_type, graphene.Field)
     assert graphene_type.type == E
 
 
+def test_should_convert_none():
+    registry.reset_global_registry()
+    dynamic_field = convert_mongoengine_field(
+        EmbeddedArticle._fields['editor'], registry.get_global_registry())
+    assert isinstance(dynamic_field, Dynamic)
+    graphene_type = dynamic_field.get_type()
+    assert graphene_type is None
+
+
 def test_should_list_of_reference_convert_list():
 
     class A(MongoengineObjectType):
 
         class Meta:
             model = Article
 
-    graphene_field = convert_mongoengine_field(Reporter._fields['articles'], A._meta.registry)
+    graphene_field = convert_mongoengine_field(
+        Reporter._fields['articles'], A._meta.registry)
     assert isinstance(graphene_field, graphene.List)
     dynamic_field = graphene_field.get_type()
     assert dynamic_field._of_type == A
@@ -110,7 +126,8 @@ class E(MongoengineObjectType):
         class Meta:
             model = EmbeddedArticle
 
-    graphene_field = convert_mongoengine_field(Reporter._fields['embedded_articles'], E._meta.registry)
+    graphene_field = convert_mongoengine_field(
+        Reporter._fields['embedded_articles'], E._meta.registry)
     assert isinstance(graphene_field, graphene.List)
     dynamic_field = graphene_field.get_type()
     assert dynamic_field._of_type == E
@@ -123,26 +140,30 @@ class E(MongoengineObjectType):
         class Meta:
             model = EmbeddedArticle
 
-    graphene_field = convert_mongoengine_field(Reporter._fields['embedded_list_articles'], E._meta.registry)
+    graphene_field = convert_mongoengine_field(
+        Reporter._fields['embedded_list_articles'], E._meta.registry)
     assert isinstance(graphene_field, graphene.List)
     dynamic_field = graphene_field.get_type()
     assert dynamic_field._of_type == E
 
 
 def test_should_self_reference_convert_dynamic():
+
     class P(MongoengineObjectType):
 
         class Meta:
             model = Player
             interfaces = (Node,)
 
-    dynamic_field = convert_mongoengine_field(Player._fields['opponent'], P._meta.registry)
+    dynamic_field = convert_mongoengine_field(
+        Player._fields['opponent'], P._meta.registry)
     assert isinstance(dynamic_field, Dynamic)
     graphene_type = dynamic_field.get_type()
     assert isinstance(graphene_type, graphene.Field)
     assert graphene_type.type == P
 
-    graphene_field = convert_mongoengine_field(Player._fields['players'], P._meta.registry)
+    graphene_field = convert_mongoengine_field(
+        Player._fields['players'], P._meta.registry)
     assert isinstance(graphene_field, MongoengineConnectionField)
 
 
@@ -158,7 +179,8 @@ class P(MongoengineObjectType):
         class Meta:
             model = Player
 
-    graphene_field = convert_mongoengine_field(Player._fields['players'], P._meta.registry)
+    graphene_field = convert_mongoengine_field(
+        Player._fields['players'], P._meta.registry)
     assert isinstance(graphene_field, graphene.List)
     dynamic_field = graphene_field.get_type()
     assert dynamic_field._of_type == P

graphene_mongo/tests/test_fields.py

@@ -1,5 +1,3 @@
-import pytest
-
 from ..fields import MongoengineConnectionField
 from .types import ArticleNode
 

graphene_mongo/tests/test_query.py

@@ -3,27 +3,26 @@
 import graphene
 
 from .fixtures import setup_fixtures
-from .models import Article, Editor, Player, Reporter
-from .types import (ArticleNode, ArticleType,
-                    EditorNode, EditorType,
-                    PlayerNode, PlayerType,
-                    ReporterNode, ReporterType)
-from ..fields import MongoengineConnectionField
+from .models import Editor, Player, Reporter
+from .types import (EditorType,
+                    PlayerType,
+                    ReporterType)
 
 setup_fixtures()
 
 
 def test_should_query_editor():
 
     class Query(graphene.ObjectType):
-       editor = graphene.Field(EditorType)
-       editors = graphene.List(EditorType)
 
-       def resolve_editor(self, *args, **kwargs):
-           return Editor.objects.first()
+        editor = graphene.Field(EditorType)
+        editors = graphene.List(EditorType)
 
-       def resolve_editors(self, *args, **kwargs):
-           return list(Editor.objects.all())
+        def resolve_editor(self, *args, **kwargs):
+            return Editor.objects.first()
+
+        def resolve_editors(self, *args, **kwargs):
+            return list(Editor.objects.all())
 
     query = '''
         query EditorQuery {
@@ -147,7 +146,7 @@ def resolve_editors(self, *args, **kwargs):
         }
     '''
     expected = {
-        'editors':[
+        'editors': [
             {
                 'firstName': 'Penny',
                 'lastName': 'Hardaway'

graphene_mongo/tests/test_relay_query.py

@@ -5,12 +5,12 @@
 from graphene.relay import Node
 
 from .fixtures import setup_fixtures
-from .models import Article, Editor, Player, Reporter
-from .types import (ArticleNode, ArticleType,
-                    EditorNode, EditorType,
-                    PlayerNode, PlayerType,
-                    ReporterNode, ReporterType,
-                    ChildNode, ChildType)
+from .models import Article, Reporter
+from .types import (ArticleNode,
+                    EditorNode,
+                    PlayerNode,
+                    ReporterNode,
+                    ChildNode,)
 from ..fields import MongoengineConnectionField
 
 setup_fixtures()

graphene_mongo/tests/test_types.py

@@ -28,6 +28,7 @@ class Meta:
         model = EmbeddedArticle
         interfaces = (Node,)
 
+
 class Character(MongoengineObjectType):
 
     class Meta:
@@ -72,6 +73,7 @@ def test_objecttype_registered():
 def test_mongoengine_inheritance():
     assert issubclass(Son._meta.model, Dad._meta.model)
 
+
 def test_node_replacedfield():
     idfield = Human._meta.fields['pub_date']
     assert isinstance(idfield, Field)
@@ -112,7 +114,6 @@ class Meta:
             model = Article
             only_fields = ('headline')
 
-
     fields = set(A._meta.fields.keys())
     assert fields == set(['headline'])
 
@@ -125,4 +126,3 @@ class Meta:
             exclude_fields = ('headline')
 
     assert 'headline' not in list(A._meta.fields.keys())
-

graphene_mongo/tests/test_utils.py

@@ -1,7 +1,3 @@
-import pytest
-from mongoengine import Document
-
-
 from ..utils import (
     get_model_fields, is_valid_mongoengine_model
 )
@@ -14,6 +10,20 @@ def test_get_model_fields_no_duplication():
     assert len(reporter_fields) == len(reporter_name_set)
 
 
+def test_get_model_fields_excluding():
+    reporter_fields = get_model_fields(Reporter, excluding=[
+        'first_name', 'last_name'])
+    reporter_name_set = set(reporter_fields)
+    assert all(field in reporter_name_set for field in [
+        'id',
+        'email',
+        'articles',
+        'embedded_articles',
+        'embedded_list_articles',
+        'awards'
+    ])
+
+
 def test_get_model_relation_fields():
     article_fields = get_model_fields(Article)
     assert all(field in set(article_fields) for field in ['editor', 'reporter'])
@@ -23,6 +33,6 @@ def test_get_base_model_fields():
     child_fields = get_model_fields(Child)
     assert all(field in set(child_fields) for field in ['bar', 'baz'])
 
+
 def test_is_valid_mongoengine_mode():
     assert is_valid_mongoengine_model(Reporter)
-

graphene_mongo/tests/utils.py

@@ -14,4 +14,3 @@ def inner(*args, **kwargs):
             registry.registry = old
             return retval
     return inner
-