Merge pull request #8 from graphql-python/refactor-test-case

Refactor test case

Author: abawchen

Makefile

@@ -8,7 +8,10 @@ clean:
 	@find . -name "*.pyc" -delete
 	@find . -name "__pycache__" -delete
 
-test: clean
+lint:
+	@flake8 graphene_mongo
+
+test: clean lint
 	py.test --cov=graphene_mongo
 
 register-pypitest:

graphene_mongo/__init__.py

@@ -9,6 +9,6 @@
 
 __all__ = [
     '__version__',
-    'MongoengineObjectType'
+    'MongoengineObjectType',
+    'MongoengineConnectionField'
 ]
-

graphene_mongo/converter.py

@@ -1,9 +1,6 @@
-from graphene import (ID, Boolean, Dynamic, Enum, Field, Float, Int, List,
-                      NonNull, String, UUID, is_node)
-from graphene.types.datetime import DateTime, Time
+from graphene import (ID, Boolean, Dynamic, Field, Float, Int, List,
+                      NonNull, String, is_node)
 from graphene.types.json import JSONString
-from graphene.utils.str_converters import to_camel_case, to_const
-from graphql import assert_valid_name
 
 import mongoengine
 
@@ -66,9 +63,9 @@ def convert_postgres_array_to_list(field, registry=None):
     if isinstance(base_type, (Dynamic)):
         base_type = base_type.get_type()._type
     if is_node(base_type):
-       return MongoengineConnectionField(base_type)
+        return MongoengineConnectionField(base_type)
     elif not isinstance(base_type, (List, NonNull)) \
-        and not isinstance(field.field, mongoengine.ReferenceField):
+            and not isinstance(field.field, mongoengine.ReferenceField):
         base_type = type(base_type)
     return List(base_type, description=field.db_field, required=not field.null)
 
@@ -86,4 +83,3 @@ def dynamic_type():
         return Field(_type)
 
     return Dynamic(dynamic_type)
-

graphene_mongo/fields.py

@@ -3,15 +3,14 @@
 from collections import OrderedDict
 from functools import partial, reduce
 
-from graphene import Field
+from graphene import Field, List
 from graphene.relay import ConnectionField
 from graphene.relay.connection import PageInfo
 from graphql_relay.connection.arrayconnection import connection_from_list_slice
 from graphene.types.argument import to_arguments
 
-from .utils import maybe_queryset
-
 
+# noqa
 class MongoengineListField(Field):
 
     def __init__(self, _type, *args, **kwargs):
@@ -21,9 +20,9 @@ def __init__(self, _type, *args, **kwargs):
     def model(self):
         return self.type.of_type._meta.node._meta.model
 
-    @staticmethod
-    def list_resolver(resolver, root, info, **args):
-        return maybe_queryset(resolver(root, info, **args))
+    # @staticmethod
+    # def list_resolver(resolver, root, info, **args):
+    #    return maybe_queryset(resolver(root, info, **args))
 
     def get_resolver(self, parent_resolver):
         return partial(self.list_resolver, parent_resolver)
@@ -115,4 +114,3 @@ def connection_resolver(cls, resolver, connection, model, root, info, **args):
 
     def get_resolver(self, parent_resolver):
         return partial(self.connection_resolver, parent_resolver, self.type, self.model)
-

graphene_mongo/registry.py

@@ -28,4 +28,3 @@ def get_global_registry():
 def reset_global_registry():
     global registry
     registry = None
-

graphene_mongo/tests/test_query.py

@@ -5,16 +5,19 @@
 from graphene.relay import Node
 
 from .models import Article, Editor, EmbeddedArticle, Reporter
-from .utils import with_local_registry
+from .types import (ArticleNode, ArticleType,
+                    EditorNode, EditorType,
+                    ReporterNode, ReporterType)
 from ..fields import MongoengineConnectionField
-from ..types import MongoengineObjectType
 
 
 def setup_fixtures():
     editor1 = Editor(first_name='Penny', last_name='Hardaway')
     editor1.save()
     editor2 = Editor(first_name='Grant', last_name='Hill')
     editor2.save()
+    editor3 = Editor(first_name='Dennis', last_name='Rodman')
+    editor3.save()
 
     reporter = Reporter(first_name='Allen', last_name='Iverson',
                         email='[email protected]',  awards=['2010-mvp'])
@@ -28,11 +31,7 @@ def setup_fixtures():
 setup_fixtures()
 
 
-@with_local_registry
 def test_should_query_editor_well():
-    class EditorType(MongoengineObjectType):
-        class Meta:
-            model = Editor
 
     class Query(graphene.ObjectType):
        editor = graphene.Field(EditorType)
@@ -65,8 +64,11 @@ def resolve_editors(self, *args, **kwargs):
         }, {
             'firstName': 'Grant',
             'lastName': 'Hill'
+        }, {
+            'firstName': 'Dennis',
+            'lastName': 'Rodman'
         }]
-        }
+    }
 
     schema = graphene.Schema(query=Query)
     result = schema.execute(query)
@@ -75,15 +77,7 @@ def resolve_editors(self, *args, **kwargs):
     assert all(item in result.data['editors'] for item in expected['editors'])
 
 
-@with_local_registry
 def test_should_query_reporter_well():
-    class ArticleType(MongoengineObjectType):
-        class Meta:
-            model = Article
-
-    class ReporterType(MongoengineObjectType):
-        class Meta:
-            model = Reporter
 
     class Query(graphene.ObjectType):
         reporter = graphene.Field(ReporterType)
@@ -123,19 +117,7 @@ def resolve_reporter(self, *args, **kwargs):
     assert dict(result.data['reporter']) == expected['reporter']
 
 
-@with_local_registry
 def test_should_node():
-    class ArticleNode(MongoengineObjectType):
-
-        class Meta:
-            model = Article
-            interfaces = (Node,)
-
-    class ReporterNode(MongoengineObjectType):
-
-        class Meta:
-            model = Reporter
-            interfaces = (Node,)
 
     class Query(graphene.ObjectType):
         node = Node.Field()
@@ -188,13 +170,7 @@ def resolve_reporter(self, *args, **kwargs):
     assert dict(result.data['reporter']) == expected['reporter']
 
 
-@with_local_registry
 def test_should_connection_field():
-    class EditorNode(MongoengineObjectType):
-
-        class Meta:
-            model = Editor
-            interfaces = (Node,)
 
     class Query(graphene.ObjectType):
         node = Node.Field()
@@ -219,13 +195,20 @@ class Query(graphene.ObjectType):
                     'node': {
                         'firstName': 'Penny',
                         'lastName': 'Hardaway'
-                    },
+                    }
                 },
                 {
                     'node': {
                         'firstName': 'Grant',
                         'lastName': 'Hill'
                     }
+
+                },
+                {
+                    'node': {
+                        'firstName': 'Dennis',
+                        'lastName': 'Rodman'
+                    }
                 }
             ]
         }
@@ -236,14 +219,7 @@ class Query(graphene.ObjectType):
     assert dict(result.data['allEditors']) == expected['allEditors']
 
 
-@with_local_registry
 def test_should_mutate_well():
-    class ArticleNode(MongoengineObjectType):
-
-        class Meta:
-            model = Article
-            interfaces = (Node,)
-
 
     class CreateArticle(graphene.Mutation):
 
@@ -292,14 +268,7 @@ class Mutation(graphene.ObjectType):
     assert not result.errors
     assert result.data == expected
 
-@with_local_registry
 def test_should_filter():
-    class ArticleNode(MongoengineObjectType):
-
-        class Meta:
-            model = Article
-            interfaces = (Node,)
-            filter_fields = ('headline',)
 
     class Query(graphene.ObjectType):
         node = Node.Field()
@@ -333,7 +302,9 @@ class Query(graphene.ObjectType):
     assert result.data == expected
 
 
+def test_should_first_n():
+    pass
+
 # TODO:
 def test_should_paging():
     pass
-

graphene_mongo/tests/types.py

@@ -0,0 +1,39 @@
+from graphene.relay import Node
+
+from .models import Article, Editor, Reporter
+from ..types import MongoengineObjectType
+
+
+class EditorType(MongoengineObjectType):
+    class Meta:
+        model = Editor
+
+
+class ArticleType(MongoengineObjectType):
+    class Meta:
+        model = Article
+
+class ReporterType(MongoengineObjectType):
+    class Meta:
+        model = Reporter
+
+
+class ArticleNode(MongoengineObjectType):
+
+    class Meta:
+        model = Article
+        interfaces = (Node,)
+
+class EditorNode(MongoengineObjectType):
+
+    class Meta:
+        model = Editor
+        interfaces = (Node,)
+
+
+class ReporterNode(MongoengineObjectType):
+
+    class Meta:
+        model = Reporter
+        interfaces = (Node,)
+

graphene_mongo/types.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 
-from graphene import Field, ObjectType
+from graphene import Field
 from graphene.relay import Connection, Node
 from graphene.types.objecttype import ObjectType, ObjectTypeOptions
 from graphene.types.utils import yank_fields_from_attrs
@@ -35,6 +35,7 @@ class MongoengineObjectTypeOptions(ObjectTypeOptions):
     connection = None  # type: Type[Connection]
     filter_fields = ()
 
+
 class MongoengineObjectType(ObjectType):
 
     @classmethod
@@ -97,17 +98,14 @@ def is_type_of(cls, root, info):
             ).format(root))
         return isinstance(root, cls._meta.model)
 
+    # noqa
     @classmethod
     def get_node(cls, id, context, info):
-        if isinstance(getattr(cls._meta.model, get_key_name(cls._meta.model)), NumberAttribute):
-            return cls._meta.model.get(int(id))
-
         return cls._meta.model.get(id)
 
     def resolve_id(self, info):
         return str(self.id)
 
-    #@classmethod
-    #def get_connection(cls):
-    #    return connection_for_type(cls)
-
+    # @classmethod
+    # def get_connection(cls):
+    #     return connection_for_type(cls)

graphene_mongo/utils.py

@@ -25,12 +25,6 @@ def is_valid_mongoengine_model(model):
     )
 
 
-def maybe_queryset(value):
-    if isinstance(value, Manager):
-        value = value.get_queryset()
-    return value
-
-
 def import_single_dispatch():
     try:
         from functools import singledispatch
@@ -54,11 +48,11 @@ def import_single_dispatch():
     return singledispatch
 
 
+# noqa
 def get_type_for_document(schema, document):
     types = schema.types.values()
     for _type in types:
         type_document = hasattr(_type, '_meta') and getattr(
             _type._meta, 'document', None)
         if document == type_document:
             return _type
-

requirements.txt

@@ -1,4 +1,5 @@
 coveralls==1.2.0
+flake8==3.5.0
 graphene==2.0.1
 iso8601==0.1.12
 mongoengine==0.15.0