diff options
Diffstat (limited to 'tests/Test')
| -rw-r--r-- | tests/Test/DirectiveSpec.hs | 4 | ||||
| -rw-r--r-- | tests/Test/FragmentSpec.hs | 16 | ||||
| -rw-r--r-- | tests/Test/RootOperationSpec.hs | 14 | ||||
| -rw-r--r-- | tests/Test/StarWars/Data.hs | 6 | ||||
| -rw-r--r-- | tests/Test/StarWars/Schema.hs | 12 |
5 files changed, 26 insertions, 26 deletions
diff --git a/tests/Test/DirectiveSpec.hs b/tests/Test/DirectiveSpec.hs index 250ef6e..9ff8d8c 100644 --- a/tests/Test/DirectiveSpec.hs +++ b/tests/Test/DirectiveSpec.hs @@ -17,9 +17,9 @@ experimentalResolver :: Schema IO experimentalResolver = Schema { query = queryType, mutation = Nothing } where resolver = pure $ Out.Int 5 - queryType = ObjectType "Query" Nothing + queryType = Out.ObjectType "Query" Nothing $ HashMap.singleton "experimentalField" - $ Field Nothing (ScalarOutputType int) mempty resolver + $ Out.Field Nothing (Out.NamedScalarType int) mempty resolver emptyObject :: Value emptyObject = object diff --git a/tests/Test/FragmentSpec.hs b/tests/Test/FragmentSpec.hs index 5ebecab..2fb12d2 100644 --- a/tests/Test/FragmentSpec.hs +++ b/tests/Test/FragmentSpec.hs @@ -50,17 +50,17 @@ hasErrors :: Value -> Bool hasErrors (Object object') = HashMap.member "errors" object' hasErrors _ = True -shirtType :: ObjectType IO -shirtType = ObjectType "Shirt" Nothing +shirtType :: Out.ObjectType IO +shirtType = Out.ObjectType "Shirt" Nothing $ HashMap.singleton resolverName - $ Field Nothing (ScalarOutputType string) mempty resolve + $ Out.Field Nothing (Out.NamedScalarType string) mempty resolve where (Schema.Resolver resolverName resolve) = size -hatType :: ObjectType IO -hatType = ObjectType "Hat" Nothing +hatType :: Out.ObjectType IO +hatType = Out.ObjectType "Hat" Nothing $ HashMap.singleton resolverName - $ Field Nothing (ScalarOutputType int) mempty resolve + $ Out.Field Nothing (Out.NamedScalarType int) mempty resolve where (Schema.Resolver resolverName resolve) = circumference @@ -69,9 +69,9 @@ toSchema (Schema.Resolver resolverName resolve) = Schema { query = queryType, mutation = Nothing } where unionMember = if resolverName == "Hat" then hatType else shirtType - queryType = ObjectType "Query" Nothing + queryType = Out.ObjectType "Query" Nothing $ HashMap.singleton resolverName - $ Field Nothing (ObjectOutputType unionMember) mempty resolve + $ Out.Field Nothing (Out.NamedObjectType unionMember) mempty resolve spec :: Spec spec = do diff --git a/tests/Test/RootOperationSpec.hs b/tests/Test/RootOperationSpec.hs index 7e20e64..a20dc51 100644 --- a/tests/Test/RootOperationSpec.hs +++ b/tests/Test/RootOperationSpec.hs @@ -14,27 +14,27 @@ import Language.GraphQL.Type.Definition import qualified Language.GraphQL.Type.Out as Out import Language.GraphQL.Type.Schema -hatType :: ObjectType IO -hatType = ObjectType "Hat" Nothing +hatType :: Out.ObjectType IO +hatType = Out.ObjectType "Hat" Nothing $ HashMap.singleton resolverName - $ Field Nothing (ScalarOutputType int) mempty resolve + $ Out.Field Nothing (Out.NamedScalarType int) mempty resolve where (Schema.Resolver resolverName resolve) = Schema.Resolver "circumference" $ pure $ Out.Int 60 schema :: Schema IO schema = Schema - (ObjectType "Query" Nothing hatField) - (Just $ ObjectType "Mutation" Nothing incrementField) + (Out.ObjectType "Query" Nothing hatField) + (Just $ Out.ObjectType "Mutation" Nothing incrementField) where garment = pure $ Schema.object [ Schema.Resolver "circumference" $ pure $ Out.Int 60 ] incrementField = HashMap.singleton "incrementCircumference" - $ Field Nothing (ScalarOutputType int) mempty + $ Out.Field Nothing (Out.NamedScalarType int) mempty $ pure $ Out.Int 61 hatField = HashMap.singleton "garment" - $ Field Nothing (ObjectOutputType hatType) mempty garment + $ Out.Field Nothing (Out.NamedObjectType hatType) mempty garment spec :: Spec spec = diff --git a/tests/Test/StarWars/Data.hs b/tests/Test/StarWars/Data.hs index 30a4cef..67a74cd 100644 --- a/tests/Test/StarWars/Data.hs +++ b/tests/Test/StarWars/Data.hs @@ -184,7 +184,7 @@ getFriends :: Character -> [Character] getFriends char = catMaybes $ liftA2 (<|>) getDroid getHuman <$> friends char getEpisode :: Int -> Maybe Text -getEpisode 4 = pure $ "NEWHOPE" -getEpisode 5 = pure $ "EMPIRE" -getEpisode 6 = pure $ "JEDI" +getEpisode 4 = pure "NEWHOPE" +getEpisode 5 = pure "EMPIRE" +getEpisode 6 = pure "JEDI" getEpisode _ = empty diff --git a/tests/Test/StarWars/Schema.hs b/tests/Test/StarWars/Schema.hs index 993672c..f32c031 100644 --- a/tests/Test/StarWars/Schema.hs +++ b/tests/Test/StarWars/Schema.hs @@ -25,10 +25,10 @@ import Test.StarWars.Data schema :: Schema Identity schema = Schema { query = queryType, mutation = Nothing } where - queryType = ObjectType "Query" Nothing $ HashMap.fromList - [ ("hero", Field Nothing (ScalarOutputType string) mempty hero) - , ("human", Field Nothing (ScalarOutputType string) mempty human) - , ("droid", Field Nothing (ScalarOutputType string) mempty droid) + queryType = Out.ObjectType "Query" Nothing $ HashMap.fromList + [ ("hero", Out.Field Nothing (Out.NamedScalarType string) mempty hero) + , ("human", Out.Field Nothing (Out.NamedScalarType string) mempty human) + , ("droid", Out.Field Nothing (Out.NamedScalarType string) mempty droid) ] hero :: ActionT Identity (Out.Value Identity) @@ -55,7 +55,7 @@ droid :: ActionT Identity (Out.Value Identity) droid = do id' <- argument "id" case id' of - In.String i -> getDroid i >>= pure . character + In.String i -> character <$> getDroid i _ -> ActionT $ throwE "Invalid arguments." character :: Character -> Out.Value Identity @@ -63,7 +63,7 @@ character char = Schema.object [ Schema.Resolver "id" $ pure $ Out.String $ id_ char , Schema.Resolver "name" $ pure $ Out.String $ name_ char , Schema.Resolver "friends" - $ pure $ Out.List $ fmap character $ getFriends char + $ pure $ Out.List $ character <$> getFriends char , Schema.Resolver "appearsIn" $ pure $ Out.List $ Out.Enum <$> catMaybes (getEpisode <$> appearsIn char) , Schema.Resolver "secretBackstory" $ Out.String |