validation: OverlappingFieldsCanBeMerged

internal/tests/all_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 	"reflect"
+	"sort"
 	"testing"
 
 	"encoding/json"
@@ -56,9 +57,18 @@ func TestAll(t *testing.T) {
 					got = append(got, err)
 				}
 			}
+			sortLocations(test.Errors)
+			sortLocations(got)
 			if !reflect.DeepEqual(test.Errors, got) {
 				t.Errorf("wrong errors\nexpected: %v\ngot:      %v", test.Errors, got)
 			}
 		})
 	}
 }
+
+func sortLocations(errs []*errors.QueryError) {
+	for _, err := range errs {
+		locs := err.Locations
+		sort.Slice(locs, func(i, j int) bool { return locs[i].Before(locs[j]) })
+	}
+}

internal/tests/testdata/export.js

@@ -38,6 +38,9 @@ let fakeModules = {
 				errors: [],
 			});
 		},
+		expectPassesRuleWithSchema(schema, rule, queryString, errors) {
+			// ignored
+		},
 		expectFailsRule(rule, queryString, errors) {
 			tests.push({
 				name: names.join('/'),
@@ -46,6 +49,9 @@ let fakeModules = {
 				errors: errors,
 			});
 		},
+		expectFailsRuleWithSchema(schema, rule, queryString, errors) {
+			// ignored
+		}
 	},
 };
 
@@ -67,7 +73,7 @@ require('./src/validation/__tests__/NoFragmentCycles-test');
 require('./src/validation/__tests__/NoUndefinedVariables-test');
 require('./src/validation/__tests__/NoUnusedFragments-test');
 require('./src/validation/__tests__/NoUnusedVariables-test');
-// require('./src/validation/__tests__/OverlappingFieldsCanBeMerged-test');
+require('./src/validation/__tests__/OverlappingFieldsCanBeMerged-test');
 require('./src/validation/__tests__/PossibleFragmentSpreads-test');
 require('./src/validation/__tests__/ProvidedNonNullArguments-test');
 require('./src/validation/__tests__/ScalarLeafs-test');