add more tests for findGraphQLTags, fix cache/schema tests (#2533)

Author: acao

packages/graphql-language-service-server/src/__tests__/GraphQLCache-test.ts

@@ -9,7 +9,9 @@
 
 jest.mock('cross-undici-fetch', () => ({
   fetch: require('fetch-mock').fetchHandler,
+  AbortController: global.AbortController,
 }));
+
 import { GraphQLSchema } from 'graphql/type';
 import { parse } from 'graphql/language';
 import { loadConfig, GraphQLExtensionDeclaration } from 'graphql-config';
@@ -72,8 +74,7 @@ describe('GraphQLCache', () => {
     });
   });
 
-  // TODO: figure out mocking undici
-  describe.skip('getSchema', () => {
+  describe('getSchema', () => {
     it('generates the schema correctly for the test app config', async () => {
       const schema = await cache.getSchema('testWithSchema');
       expect(schema instanceof GraphQLSchema).toEqual(true);

packages/graphql-language-service-server/src/__tests__/findGraphQLTags-test.ts

@@ -140,6 +140,13 @@ query Test {
 `);
   });
 
+  it('finds queries with nested graphql.experimental template tag expression', async () => {
+    const text = `const query = graphql.experimental\` query {} \``;
+
+    const contents = findGraphQLTags(text, '.ts');
+    expect(contents[0].template).toEqual(` query {} `);
+  });
+
   it('finds queries with nested template tag expressions', async () => {
     const text = `export default {
   else: () => gql\` query {} \`
@@ -151,13 +158,39 @@ query Test {
 
   it('finds queries with template tags inside call expressions', async () => {
     const text = `something({
-  else: () => gql\` query {} \`
+  else: () => graphql\` query {} \`
 })`;
 
     const contents = findGraphQLTags(text, '.ts');
     expect(contents[0].template).toEqual(` query {} `);
   });
 
+  it('finds multiple queries in a single file', async () => {
+    const text = `something({
+  else: () => gql\` query {} \`
+})
+const query = graphql\`query myQuery {}\``;
+
+    const contents = findGraphQLTags(text, '.ts');
+
+    expect(contents.length).toEqual(2);
+
+    // let's double check that we're properly
+    // extracting the positions of each embedded string
+    expect(contents[0].range.start.line).toEqual(1);
+    expect(contents[0].range.start.character).toEqual(18);
+    expect(contents[0].range.end.line).toEqual(1);
+    expect(contents[0].range.end.character).toEqual(28);
+    expect(contents[0].template).toEqual(` query {} `);
+
+    // and the second string, with correct positional information!
+    expect(contents[1].range.start.line).toEqual(3);
+    expect(contents[1].range.start.character).toEqual(22);
+    expect(contents[1].range.end.line).toEqual(3);
+    expect(contents[1].range.end.character).toEqual(38);
+    expect(contents[1].template).toEqual(`query myQuery {}`);
+  });
+
   it('ignores non gql tagged templates', async () => {
     const text = `
 // @flow