Move directive predicates tests and fix test names

Replicates graphql/graphql-js@36d13ae

Author: Cito

README.md

@@ -13,7 +13,7 @@ a query language for APIs created by Facebook.
 [![Code Style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
 The current version 1.0.2 of GraphQL-core-next is up-to-date with GraphQL.js version
-14.1.1. All parts of the API are covered by an extensive test suite of currently 1724
+14.1.1. All parts of the API are covered by an extensive test suite of currently 1730
 unit tests.
 
 

graphql/type/directives.py

@@ -175,7 +175,7 @@ def assert_directive(directive: Any) -> GraphQLDirective:
 
 def is_specified_directive(directive: GraphQLDirective):
     """Check whether the given directive is one of the specified directives."""
-    return any(
+    return isinstance(directive, GraphQLDirective) and any(
         specified_directive.name == directive.name
         for specified_directive in specified_directives
     )

tests/type/test_directives.py

@@ -1,15 +1,7 @@
 from pytest import raises
 
 from graphql.language import DirectiveLocation, DirectiveDefinitionNode, Node
-from graphql.type import (
-    GraphQLArgument,
-    GraphQLDirective,
-    GraphQLInt,
-    GraphQLString,
-    GraphQLSkipDirective,
-    is_directive,
-    is_specified_directive,
-)
+from graphql.type import GraphQLArgument, GraphQLDirective, GraphQLInt, GraphQLString
 
 
 def describe_type_system_directive():
@@ -77,19 +69,19 @@ def directive_has_repr():
         directive = GraphQLDirective("foo", [])
         assert repr(directive) == "<GraphQLDirective(@foo)>"
 
-    def reject_an_unnamed_directivce():
+    def rejects_an_unnamed_directive():
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             GraphQLDirective(None, locations=[])  # type: ignore
         assert str(exc_info.value) == "Directive must be named."
 
-    def reject_directive_with_incorrectly_typed_name():
+    def rejects_a_directive_with_incorrectly_typed_name():
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             GraphQLDirective({"bad": True}, locations=[])  # type: ignore
         assert str(exc_info.value) == "The directive name must be a string."
 
-    def reject_directive_with_incorrectly_typed_args():
+    def rejects_a_directive_with_incorrectly_typed_args():
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             GraphQLDirective("Foo", locations=[], args=["arg"])  # type: ignore
@@ -113,13 +105,13 @@ def reject_directive_with_incorrectly_typed_args():
             "Foo args must be GraphQLArgument or input type objects."
         )
 
-    def reject_directive_with_undefined_locations():
+    def rejects_a_directive_with_undefined_locations():
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             GraphQLDirective("Foo", locations=None)  # type: ignore
         assert str(exc_info.value) == "Foo locations must be a list/tuple."
 
-    def recect_directive_with_incorrectly_typed_locations():
+    def recects_a_directive_with_incorrectly_typed_locations():
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             GraphQLDirective("Foo", locations="bad")  # type: ignore
@@ -131,43 +123,18 @@ def recect_directive_with_incorrectly_typed_locations():
             "Foo locations must be DirectiveLocation objects."
         )
 
-    def reject_directive_with_incorrectly_typed_description():
+    def rejects_a_directive_with_incorrectly_typed_description():
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             GraphQLDirective(
                 "Foo", locations=[], description={"bad": True}
             )  # type: ignore
         assert str(exc_info.value) == "Foo description must be a string."
 
-    def reject_directive_with_incorrectly_typed_ast_node():
+    def rejects_a_directive_with_incorrectly_typed_ast_node():
         with raises(TypeError) as exc_info:
             # noinspection PyTypeChecker
             GraphQLDirective("Foo", locations=[], ast_node=Node())  # type: ignore
         assert str(exc_info.value) == (
             "Foo AST node must be a DirectiveDefinitionNode."
         )
-
-
-def describe_directive_predicates():
-    def describe_is_directive():
-        def returns_true_for_directive():
-            directive = GraphQLDirective("Foo", [])
-            assert is_directive(directive) is True
-
-        def returns_false_for_type_class_rather_than_instance():
-            assert is_directive(GraphQLDirective) is False
-
-        def returns_false_for_other_instances():
-            assert is_directive(GraphQLString) is False
-
-        def returns_false_for_random_garbage():
-            assert is_directive(None) is False
-            assert is_directive({"what": "is this"}) is False
-
-    def describe_is_specified_directive():
-        def returns_true_for_specified_directive():
-            assert is_specified_directive(GraphQLSkipDirective) is True
-
-        def returns_false_for_unspecified_directive():
-            directive = GraphQLDirective("Foo", [])
-            assert is_specified_directive(directive) is False

tests/type/test_predicate.py

@@ -1,15 +1,20 @@
 from pytest import raises
 
+from graphql.language import DirectiveLocation
 from graphql.type import (
     GraphQLArgument,
+    GraphQLDeprecatedDirective,
+    GraphQLDirective,
     GraphQLEnumType,
+    GraphQLIncludeDirective,
     GraphQLInputField,
     GraphQLInputObjectType,
     GraphQLInterfaceType,
     GraphQLList,
     GraphQLNonNull,
     GraphQLObjectType,
     GraphQLScalarType,
+    GraphQLSkipDirective,
     GraphQLString,
     GraphQLUnionType,
     assert_abstract_type,
@@ -33,6 +38,7 @@
     get_nullable_type,
     is_abstract_type,
     is_composite_type,
+    is_directive,
     is_enum_type,
     is_input_object_type,
     is_input_type,
@@ -47,6 +53,7 @@
     is_object_type,
     is_output_type,
     is_scalar_type,
+    is_specified_directive,
     is_type,
     is_union_type,
     is_wrapping_type,
@@ -453,3 +460,54 @@ def returns_false_for_optional_input_field():
                 GraphQLNonNull(GraphQLString), default_value="default"
             )
             assert is_required_input_field(opt_field4) is False
+
+    def describe_directive_predicates():
+        def describe_is_directive():
+            def returns_true_for_directives():
+                directive = GraphQLDirective("Foo", [DirectiveLocation.QUERY])
+                assert is_directive(directive) is True
+                assert is_directive(GraphQLSkipDirective) is True
+
+            def returns_false_for_directive_class_rather_than_instance():
+                assert is_directive(GraphQLDirective) is False
+
+            def returns_false_for_object_type():
+                assert is_directive(ObjectType) is False
+
+            def returns_false_for_scalar_type():
+                assert is_directive(GraphQLString) is False
+
+            def returns_false_for_random_garbage():
+                assert is_directive(None) is False
+                assert is_directive({"what": "is this"}) is False
+
+        def describe_is_specified_directive():
+            def returns_true_for_specified_directives():
+                assert is_specified_directive(GraphQLIncludeDirective) is True
+                assert is_specified_directive(GraphQLSkipDirective) is True
+                assert is_specified_directive(GraphQLDeprecatedDirective) is True
+
+            def returns_false_for_custom_directive():
+                directive = GraphQLDirective("Foo", [DirectiveLocation.QUERY])
+                assert is_specified_directive(directive) is False
+
+            def returns_false_for_directive_class_rather_than_instance():
+                assert is_specified_directive(GraphQLDirective) is False
+
+            def returns_false_for_object_type():
+                assert is_specified_directive(ObjectType) is False
+
+            def returns_false_for_spec_defined_scalar_type():
+                assert is_specified_directive(GraphQLString) is False
+
+            def returns_false_for_scalar_type_with_name_of_specified_directive():
+                assert (
+                    is_specified_directive(
+                        GraphQLScalarType("deprecated", lambda: None)
+                    )
+                    is False
+                )
+
+            def returns_false_for_random_garbage():
+                assert is_specified_directive(None) is False
+                assert is_specified_directive({"what": "is this"}) is False