addressed minor PR comments, added test to eightFunction for conflicting variable names, corrected weightFucntion expected results

Author: shalarewicz

test/analysis/typeComplexityAnalysis.test.ts

@@ -137,7 +137,7 @@ const typeWeights: TypeWeightObject = {
             id: 0,
             name: 0,
             homePlanet: 0,
-            appearsIn: jest.fn(), // FIXME: resolves to an unbounded list of enums. We aren't handling this yet
+            appearsIn: 0,
             friends: mockHumanFriendsFunction,
         },
     },
@@ -147,7 +147,7 @@ const typeWeights: TypeWeightObject = {
         fields: {
             id: 0,
             name: 0,
-            appearsIn: jest.fn(), // FIXME: resolves to an unbounded list of enums. We aren't handling this yet
+            appearsIn: 0,
             friends: mockDroidFriendsFunction,
         },
     },
@@ -290,12 +290,12 @@ describe('Test getQueryTypeComplexity function', () => {
             variables = { first: 4 };
             mockWeightFunction.mockReturnValueOnce(4);
             query = `query queryVariables($first: Int) {reviews(episode: EMPIRE, first: $first) { stars, commentary } }`;
-            expect(getQueryTypeComplexity(parse(query), variables, typeWeights)).toBe(5); // 1 Query + 3 reviews
+            expect(getQueryTypeComplexity(parse(query), variables, typeWeights)).toBe(5); // 1 Query + 4 reviews
             expect(mockWeightFunction.mock.calls.length).toBe(2);
             expect(mockWeightFunction.mock.calls[1].length).toBe(1);
         });
 
-        xdescribe('with nested lists', () => {
+        describe('with nested lists', () => {
             test('and simple nesting', () => {
                 query = `
                 query { 
@@ -310,7 +310,7 @@ describe('Test getQueryTypeComplexity function', () => {
                     }
                 }`;
                 mockHumanFriendsFunction.mockReturnValueOnce(5).mockReturnValueOnce(3);
-                expect(getQueryTypeComplexity(parse(query), variables, typeWeights)).toBe(17); // 1 Query + 1 human/character +  (5 friends/character X 3 friends/characters)
+                expect(getQueryTypeComplexity(parse(query), {}, typeWeights)).toBe(17); // 1 Query + 1 human/character +  (5 friends/character X 3 friends/characters)
                 expect(mockHumanFriendsFunction.mock.calls.length).toBe(2);
             });
 

test/analysis/weightFunction.test.ts

@@ -40,7 +40,7 @@ describe('Weight Function correctly parses Argument Nodes if', () => {
         xtest('and a value is not provided with the query', () => {
             const query = `query { reviews(episode: NEWHOPE) { stars, episode } }`;
             const queryAST: DocumentNode = parse(query);
-            expect(getQueryTypeComplexity(queryAST, {}, typeWeights)).toBe(5);
+            expect(getQueryTypeComplexity(queryAST, {}, typeWeights)).toBe(6);
         });
 
         test('and a scalar value is provided with the query', () => {
@@ -52,8 +52,8 @@ describe('Weight Function correctly parses Argument Nodes if', () => {
         xtest('and the argument is passed in as a variable', () => {
             const query = `query variableQuery ($items: Int){ reviews(episode: NEWHOPE, first: $items) { stars, episode } }`;
             const queryAST: DocumentNode = parse(query);
-            expect(getQueryTypeComplexity(queryAST, { items: 7, first: 4 }, typeWeights)).toBe(8);
-            expect(getQueryTypeComplexity(queryAST, { first: 4, items: 7 }, typeWeights)).toBe(8);
+            expect(getQueryTypeComplexity(queryAST, { items: 7, first: 4 }, typeWeights)).toBe(9);
+            expect(getQueryTypeComplexity(queryAST, { first: 4, items: 7 }, typeWeights)).toBe(9);
         });
     });
 
@@ -74,7 +74,7 @@ describe('Weight Function correctly parses Argument Nodes if', () => {
         xtest('and the argument is passed in as a variable', () => {
             const query = `query variableQuery ($items: Int){ heroes(episode: NEWHOPE, first: $items) { stars, episode } }`;
             const queryAST: DocumentNode = parse(query);
-            expect(getQueryTypeComplexity(queryAST, { items: 7 }, typeWeights)).toBe(8);
+            expect(getQueryTypeComplexity(queryAST, { items: 7 }, typeWeights)).toBe(9);
         });
     });
 
@@ -84,7 +84,13 @@ describe('Weight Function correctly parses Argument Nodes if', () => {
         });
         const query = `query { heroes(episode: NEWHOPE, first: 3) { stars, episode } }`;
         const queryAST: DocumentNode = parse(query);
-        expect(getQueryTypeComplexity(queryAST, {}, customTypeWeights)).toBe(10);
+        expect(getQueryTypeComplexity(queryAST, {}, customTypeWeights)).toBe(5);
+    });
+
+    test('variable names matching limiting keywords do not interfere with scalar argument values', () => {
+        const query = `query variableQuery ($items: Int){ heroes(episode: NEWHOPE, first: 3) { stars, episode } }`;
+        const queryAST: DocumentNode = parse(query);
+        expect(getQueryTypeComplexity(queryAST, { first: 7 }, typeWeights)).toBe(5);
     });
 
     xtest('an invalid arg type is provided', () => {