Improved order preserving

Author: syrusakbary

tests/connection/test_connection.py

@@ -1,3 +1,4 @@
+import json
 from collections import namedtuple
 from pytest import raises
 from graphql.core import graphql
@@ -33,6 +34,7 @@
 userType = GraphQLObjectType(
   'User',
   fields= lambda: {
+    'id': GraphQLField(GraphQLString, resolver=lambda *_: 'id'),
     'name': GraphQLField(GraphQLString),
     'friends': GraphQLField(
       friendConnection,
@@ -111,3 +113,44 @@ def test_include_connections_and_edge_types():
     result = graphql(schema, query)
     assert not result.errors
     assert result.data == expected
+
+
+def test_edges_preserve_order1():
+    query = '''
+      query FriendsQuery {
+        user {
+          friends(first: 1) {
+            edges {
+              node {
+                name
+                id
+              }
+            }
+          }
+        }
+      }
+    '''
+    result = graphql(schema, query)
+    assert not result.errors
+    assert json.dumps(result.data) == '{"user": {"friends": {"edges": [{"node": {"name": "Dan", "id": "id"}}]}}}'
+
+
+def test_edges_preserve_order2():
+    query = '''
+      query FriendsQuery {
+        user {
+          friends(first: 1) {
+            edges {
+              node {
+                id
+                name
+              }
+            }
+          }
+        }
+      }
+    '''
+    result = graphql(schema, query)
+    assert not result.errors
+    assert json.dumps(result.data) == '{"user": {"friends": {"edges": [{"node": {"id": "id", "name": "Dan"}}]}}}'
+

tests/node/test_node.py

@@ -1,3 +1,4 @@
+import json
 from collections import namedtuple
 from pytest import raises
 from graphql.core import graphql
@@ -37,7 +38,7 @@ def getNode(id, info):
         return photoData[id]
 
 def getNodeType(obj):
-    if obj.id in userData:
+    if str(obj.id) in userData:
         return userType
     else:
         return photoType
@@ -49,7 +50,7 @@ def getNodeType(obj):
     'User',
     fields= lambda: {
         'id': GraphQLField(GraphQLNonNull(GraphQLID)),
-        'name': GraphQLField(GraphQLString),
+        'name': GraphQLField(GraphQLString, resolver=lambda *_: 'name'),
     },
     interfaces= [nodeInterface]
 )
@@ -67,11 +68,13 @@ def getNodeType(obj):
     'Query',
     fields= lambda: {
         'node': nodeField,
+        'user': GraphQLField(userType, resolver=lambda *_: userData['1']),
     }
 )
 
 schema = GraphQLSchema(query=queryType)
 
+
 def test_include_connections_and_edge_types():
     query = '''
       {
@@ -89,3 +92,62 @@ def test_include_connections_and_edge_types():
     assert not result.errors
     assert result.data == expected
 
+
+def test_preserves_order1():
+    query = '''
+      {
+        node(id: "1") {
+          ... on User {
+            name
+            id
+          }
+        }
+      }
+    '''
+    result = graphql(schema, query)
+    assert not result.errors
+    assert json.dumps(result.data) == '{"node": {"name": "name", "id": "1"}}'
+
+
+def test_preserves_order2():
+    query = '''
+      {
+        node(id: "1") {
+          ... on User {
+            id
+            name
+          }
+        }
+      }
+    '''
+    result = graphql(schema, query)
+    assert not result.errors
+    assert json.dumps(result.data) == '{"node": {"id": "1", "name": "name"}}'
+
+
+def test_preserves_order_general1():
+    query = '''
+      {
+        user {
+            id
+            name
+        }
+      }
+    '''
+    result = graphql(schema, query)
+    assert not result.errors
+    assert json.dumps(result.data) == '{"user": {"id": "1", "name": "name"}}'
+
+
+def test_preserves_order_general2():
+    query = '''
+      {
+        user {
+            name
+            id
+        }
+      }
+    '''
+    result = graphql(schema, query)
+    assert not result.errors
+    assert json.dumps(result.data) == '{"user": {"name": "name", "id": "1"}}'