Use func var to override GraphQL calls

probablycorey · probablycorey · commit 59ddb5607ddb · 2019-10-15T14:19:56.000-07:00
diff --git a/api/client.go b/api/client.go
@@ -21,7 +21,7 @@ type graphQLResponse struct {
 }
 
 /*
-graphQL usage
+GraphQL: Declared as an external variable so it can be mocked in tests
 
 type repoResponse struct {
 	Repository struct {
@@ -45,7 +45,7 @@ if err != nil {
 
 fmt.Printf("%+v\n", resp)
 */
-func graphQL(query string, variables map[string]string, v interface{}) error {
+var GraphQL = func(query string, variables map[string]string, v interface{}) error {
 	url := "https://api.github.com/graphql"
 	reqBody, err := json.Marshal(map[string]interface{}{"query": query, "variables": variables})
 	if err != nil {
diff --git a/api/queries.go b/api/queries.go
@@ -21,8 +21,6 @@ type PullRequest struct {
 	HeadRefName string
 }
 
-var OverriddenQueryFunction func(query string, variables map[string]string, v interface{}) error
-
 func PullRequests() (PullRequestsPayload, error) {
 	type edges struct {
 		Edges []struct {
@@ -100,12 +98,7 @@ func PullRequests() (PullRequestsPayload, error) {
 	}
 
 	var resp response
-	var err error
-	if OverriddenQueryFunction != nil {
-		err = OverriddenQueryFunction(query, variables, &resp)
-	} else {
-		err = graphQL(query, variables, &resp)
-	}
+	err := GraphQL(query, variables, &resp)
 	if err != nil {
 		return PullRequestsPayload{}, err
 	}
diff --git a/test/helpers.go b/test/helpers.go
@@ -74,7 +74,8 @@ func MockGraphQLResponse(fixtureName string) (teardown func()) {
 	pwd, _ := os.Getwd()
 	fixturePath := filepath.Join(pwd, "..", "test", "fixtures", fixtureName)
 
-	api.OverriddenQueryFunction = func(query string, variables map[string]string, v interface{}) error {
+	originalGraphQL := api.GraphQL
+	api.GraphQL = func(query string, variables map[string]string, v interface{}) error {
 		contents, err := ioutil.ReadFile(fixturePath)
 		if err != nil {
 			return err
@@ -89,7 +90,7 @@ func MockGraphQLResponse(fixtureName string) (teardown func()) {
 	}
 
 	return func() {
-		api.OverriddenQueryFunction = nil
+		api.GraphQL = originalGraphQL
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ func MockGraphQLResponse(fixtureName string) (teardown func()) {`
`74`	`74`	`pwd, _ := os.Getwd()`
`75`	`75`	`fixturePath := filepath.Join(pwd, "..", "test", "fixtures", fixtureName)`
`76`	`76`
`77`		`- api.OverriddenQueryFunction = func(query string, variables map[string]string, v interface{}) error {`
	`77`	`+ originalGraphQL := api.GraphQL`
	`78`	`+ api.GraphQL = func(query string, variables map[string]string, v interface{}) error {`
`78`	`79`	`contents, err := ioutil.ReadFile(fixturePath)`
`79`	`80`	`if err != nil {`
`80`	`81`	`return err`
`@@ -89,7 +90,7 @@ func MockGraphQLResponse(fixtureName string) (teardown func()) {`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`return func() {`
`92`		`- api.OverriddenQueryFunction = nil`
	`93`	`+ api.GraphQL = originalGraphQL`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`