Merge branch 'master' of github.com:graphql-python/graphene

Author: syrusakbary

docs/pages/docs/mutations.md

@@ -18,7 +18,7 @@ class CreatePerson(graphene.Mutation):
     class Input:
         name = graphene.String()
 
-    ok = graphene.String()
+    ok = graphene.Boolean()
     person = graphene.Field('Person')
 
     @classmethod

graphene/contrib/django/debug/tests/test_query.py

@@ -125,14 +125,14 @@ class Meta:
             model = Reporter
 
     class Query(graphene.ObjectType):
-        all_reporters_connection = DjangoConnectionField(ReporterType)
+        all_reporters = DjangoConnectionField(ReporterType)
 
         def resolve_all_reporters_connection(self, *args, **kwargs):
             return Reporter.objects.all()
 
     query = '''
         query ReporterQuery {
-          allReportersConnection(first:1) {
+          allReporters(first:1) {
             edges {
               node {
                 lastName
@@ -147,7 +147,7 @@ def resolve_all_reporters_connection(self, *args, **kwargs):
         }
     '''
     expected = {
-        'allReportersConnection': {
+        'allReporters': {
             'edges': [{
                 'node': {
                     'lastName': 'ABA',
@@ -180,23 +180,14 @@ class Meta:
             model = Reporter
 
     class Query(graphene.ObjectType):
-        all_reporters_connection_filter = DjangoFilterConnectionField(ReporterType)
+        all_reporters = DjangoFilterConnectionField(ReporterType)
 
         def resolve_all_reporters_connection_filter(self, *args, **kwargs):
             return Reporter.objects.all()
 
-        def resolve_all_reporters_connection(self, *args, **kwargs):
-            return Reporter.objects.all()
-
-        def resolve_all_reporters(self, *args, **kwargs):
-            return Reporter.objects.all()
-
-        def resolve_reporter(self, *args, **kwargs):
-            return Reporter.objects.first()
-
     query = '''
         query ReporterQuery {
-          allReportersConnectionFilter(first:1) {
+          allReporters(first:1) {
             edges {
               node {
                 lastName
@@ -211,7 +202,7 @@ def resolve_reporter(self, *args, **kwargs):
         }
     '''
     expected = {
-        'allReportersConnectionFilter': {
+        'allReporters': {
             'edges': [{
                 'node': {
                     'lastName': 'ABA',