Merge pull request 99designs#279 from 99designs/integration-tests

Integration tests

.circleci/config.yml

@@ -1,20 +1,48 @@
 version: 2
 jobs:
   build:
+    working_directory: /app
     docker:
-      - image: golang:1.9
-    working_directory: /go/src/github.com/99designs/gqlgen
-    steps: &steps
+      - image: docker:18
+    steps:
       - checkout
-      - run: >
-          curl -L -o /bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 &&
-          chmod +x /bin/dep &&
-          go get -u github.com/alecthomas/gometalinter github.com/vektah/gorunpkg &&
-          gometalinter --install &&
-          dep ensure -vendor-only
-      - run: go install -v . && go get -u github.com/vektah/dataloaden github.com/pkg/errors
-      - run: go generate ./... && if [[ $(git --no-pager diff) ]] ; then echo "you need to run go generate" ; git --no-pager diff ; exit 1 ; fi
-      - run: go vet ./...
-      - run: go test -race ./...
-      - run: gometalinter --vendor ./...
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: "docker build"
+          command: |
+            docker build -f .circleci/golang.Dockerfile -t gqlgen/golang .
+            docker build -f .circleci/node.Dockerfile -t gqlgen/node .
+
+      - run:
+          name: "golang tests"
+          command: docker run --rm gqlgen/golang .circleci/test.sh
+
+      - run:
+          name: "integration tests"
+          command: |
+            function cleanup {
+              echo "Cleaning up containers..."
+              docker kill $SERVER_CONTAINER 1>/dev/null 2>/dev/null || true
+              docker rm --force -v $SERVER_CONTAINER 1>/dev/null 2>/dev/null || true
+            }
+            trap cleanup EXIT
+
+            SERVER_CONTAINER=$(docker run -d \
+                -e PORT=1234 \
+                --name integration_server \
+                gqlgen/golang go run ./integration/server/server.go \
+            )
+
+            sleep 2
+
+            docker run \
+                -e SERVER_URL=http://integration_server:1234/query \
+                --link=integration_server \
+                gqlgen/node ../.circleci/integration.sh
+
+            echo "### server logs"
+            docker logs $SERVER_CONTAINER
+
+            exit $(docker inspect $SERVER_CONTAINER --format='{{.State.ExitCode}}')
 

.circleci/golang.Dockerfile

@@ -0,0 +1,12 @@
+FROM golang:1.10
+
+RUN curl -L -o /bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && chmod +x /bin/dep
+RUN go get -u github.com/alecthomas/gometalinter github.com/vektah/gorunpkg
+RUN gometalinter --install
+
+WORKDIR /go/src/github.com/99designs/gqlgen
+
+COPY Gopkg.* /go/src/github.com/99designs/gqlgen/
+RUN dep ensure -v --vendor-only
+
+COPY . /go/src/github.com/99designs/gqlgen/

.circleci/integration.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -eu
+
+echo "### running jest integration spec"
+./node_modules/.bin/jest --color
+
+
+echo "### validating introspected schema"
+./node_modules/.bin/graphql get-schema
+
+if ! diff <(tail -n +3 schema-expected.graphql) <(tail -n +3 schema-fetched.graphql) ; then
+    echo "The expected schema has changed, you need to update schema-expected.graphql with any expected changes"
+    exit 1
+fi
+
+

.circleci/node.Dockerfile

@@ -0,0 +1,9 @@
+FROM node:10
+
+WORKDIR /gqlgen/integration
+
+
+COPY integration/package*.json /gqlgen/integration/
+RUN npm ci
+
+COPY . /gqlgen/

.circleci/test.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -eu
+
+echo "### go generating"
+go generate $(go list ./... | grep -v codegen/tests)
+
+if [[ $(git --no-pager diff) ]] ; then
+    echo "you need to run go generate"
+    git --no-pager diff
+    exit 1
+fi
+
+echo "### running testsuite"
+go test -race $(go list ./... | grep -v codegen/tests)
+
+echo "### linting"
+gometalinter --vendor ./...

.dockerignore

@@ -0,0 +1,3 @@
+/**/node_modules
+/codegen/tests/gen
+/vendor

.editorconfig

@@ -11,7 +11,7 @@ indent_size = 4
 [*.{go,gotpl}]
 indent_style = tab
 
-[*.{yml}]
+[*.yml]
 indent_size = 2
 
 # These often end up with go code inside, so lets keep tabs

.gitignore

@@ -1,6 +1,8 @@
 /vendor
 /docs/public
 /example/chat/node_modules
+/integration/node_modules
+/integration/schema-fetched.graphql
 /example/chat/package-lock.json
 /codegen/tests/gen
 

example/scalars/resolvers.go

@@ -29,13 +29,13 @@ func (r *queryResolver) User(ctx context.Context, id external.ObjectID) (*model.
 		ID:      id,
 		Name:    fmt.Sprintf("Test User %d", id),
 		Created: time.Now(),
-		Address: model.Address{ID: 1, Location: &model.Point{1, 2}},
+		Address: model.Address{ID: 1, Location: &model.Point{X: 1, Y: 2}},
 		Tier:    model.TierC,
 	}, nil
 }
 
 func (r *queryResolver) Search(ctx context.Context, input model.SearchArgs) ([]model.User, error) {
-	location := model.Point{1, 2}
+	location := model.Point{X: 1, Y: 2}
 	if input.Location != nil {
 		location = *input.Location
 	}
@@ -70,5 +70,5 @@ func (r *userResolver) PrimitiveResolver(ctx context.Context, obj *model.User) (
 }
 
 func (r *userResolver) CustomResolver(ctx context.Context, obj *model.User) (model.Point, error) {
-	return model.Point{5, 1}, nil
+	return model.Point{X: 5, Y: 1}, nil
 }

graphql/introspection/type.go

@@ -31,25 +31,26 @@ func WrapTypeFromType(s *ast.Schema, typ *ast.Type) *Type {
 }
 
 func (t *Type) Kind() string {
-	if t.def != nil {
-		return string(t.def.Kind)
-	}
+	if t.typ != nil {
+		if t.typ.NonNull {
+			return "NON_NULL"
+		}
 
-	if t.typ.NonNull {
-		return "NOT_NULL"
+		if t.typ.Elem != nil {
+			return "LIST"
+		}
+	} else {
+		return string(t.def.Kind)
 	}
 
-	if t.typ.Elem != nil {
-		return "LIST"
-	}
-	return "UNKNOWN"
+	panic("UNKNOWN")
 }
 
-func (t *Type) Name() string {
+func (t *Type) Name() *string {
 	if t.def == nil {
-		return ""
+		return nil
 	}
-	return t.def.Name
+	return &t.def.Name
 }
 
 func (t *Type) Description() string {
@@ -164,10 +165,10 @@ func (t *Type) OfType() *Type {
 	}
 	if t.typ.NonNull {
 		// fake non null nodes
-		cpy := t.typ
+		cpy := *t.typ
 		cpy.NonNull = false
 
-		return WrapTypeFromType(t.schema, cpy)
+		return WrapTypeFromType(t.schema, &cpy)
 	}
 	return WrapTypeFromType(t.schema, t.typ.Elem)
 }

graphql/introspection/type_test.go

@@ -21,7 +21,7 @@ func TestType(t *testing.T) {
 	}
 
 	t.Run("name", func(t *testing.T) {
-		require.Equal(t, "Query", schemaType.Name())
+		require.Equal(t, "Query", *schemaType.Name())
 	})
 
 	t.Run("description", func(t *testing.T) {

integration/.babelrc

@@ -0,0 +1,3 @@
+{
+    "presets": ["env"]
+}

integration/.graphqlconfig

@@ -0,0 +1,14 @@
+{
+  "projects": {
+    "Project Name": {
+      "schemaPath": "schema-fetched.graphql",
+      "extensions": {
+        "endpoints": {
+          "dev":  {
+            "url": "${env:SERVER_URL}"
+          }
+        }
+      }
+    }
+  }
+}