Correct resolver batching behavior #1495
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,11 +58,11 @@ describe("batchLoader", () => { | |
| ) | ||
| const batch = batchLoader({ multipleLoader }) | ||
|
|
||
| await batch({ id: ["foo"], param: "bar" }) | ||
| expect(multipleLoader).toBeCalledWith({ | ||
| batched: true, | ||
| id: ["foo"], | ||
| param: "bar", | ||
| }) | ||
| }) | ||
|
|
||
|
|
@@ -79,55 +79,58 @@ describe("batchLoader", () => { | |
|
|
||
| expect(multipleLoader).toBeCalledTimes(1) | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| describe("serializeParams", () => { | ||
| const { serializeParams } = require("../batchLoader") | ||
|
There was a problem hiding this comment. Btw, why are you loading these functions this way? If you would import them as normal, you could do There was a problem hiding this comment. That's a good tip! I'm doing the imports this way because earlier in the tests I mock the dependency to override the feature flag. https:/artsy/metaphysics/blob/batching-bugfix/src/lib/loaders/__tests__/batchLoader.test.ts#L10 There was a problem hiding this comment. Oh, but actually it doesn’t seem like you’d need to do any mocking for that, you can just change the value and reset it from an Anyways, not a blocker for this PR. |
||
|
|
||
| it("should return an empty string for a param object with only id", () => { | ||
| expect(serializeParams({ id: "a" })).toBe("") | ||
| }) | ||
| it("should return key=value for every entry in the params object", () => { | ||
| expect(serializeParams({ id: "a", foo: "bar", bleep: "bloop" })).toBe( | ||
| "bleep=bloop&foo=bar" | ||
| ) | ||
| }) | ||
| }) | ||
|
|
||
| describe("groupByParams", () => { | ||
| const { groupByParams } = require("../batchLoader") | ||
| it("should handle a single key", () => { | ||
| expect(groupByParams([{ id: "a" }])).toEqual([ | ||
| [""], | ||
alloy marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [ | ||
| [ | ||
| { | ||
| id: "a", | ||
| }, | ||
| ], | ||
| ], | ||
| ]) | ||
| }) | ||
|
|
||
| it("should group single keys together", () => { | ||
| const keys = [ | ||
| { | ||
| id: "a", | ||
| }, | ||
| { | ||
| id: "b", | ||
| }, | ||
| ] | ||
| expect(groupByParams(keys)).toEqual([ | ||
| [""], | ||
| [ | ||
| [ | ||
| { | ||
| id: "a", | ||
| }, | ||
| { | ||
| id: "b", | ||
| }, | ||
| ], | ||
| ], | ||
| ]) | ||
| }) | ||
|
|
||
|
|
@@ -142,38 +145,75 @@ describe("groupKeys", () => { | |
| foo: "bar", | ||
| }, | ||
| ] | ||
| expect(groupByParams(keys)).toEqual([ | ||
| ["foo=bar"], | ||
| [ | ||
| [ | ||
| { | ||
| id: "a", | ||
| foo: "bar", | ||
| }, | ||
|
|
||
| { | ||
| id: "b", | ||
| foo: "bar", | ||
| }, | ||
| ], | ||
| ], | ||
| ]) | ||
| }) | ||
|
|
||
| it("should separate keys with different parameters", () => { | ||
| const keys = [ | ||
| { id: "a" }, | ||
| { id: "b", foo: "bar" }, | ||
| { id: "c", foo: "bar", boo: "baz" }, | ||
| ] | ||
|
|
||
| expect(groupByParams(keys)).toEqual([ | ||
| ["", "foo=bar", "boo=baz&foo=bar"], | ||
| [ | ||
| [ | ||
| { | ||
| id: "a", | ||
| }, | ||
| ], | ||
| [ | ||
| { | ||
| id: "b", | ||
| foo: "bar", | ||
| }, | ||
| ], | ||
| [ | ||
| { | ||
| id: "c", | ||
| foo: "bar", | ||
| boo: "baz", | ||
| }, | ||
| ], | ||
| ], | ||
| ]) | ||
| }) | ||
| }) | ||
|
|
||
| describe("cacheKeyFn", () => { | ||
| const { cacheKeyFn } = require("../batchLoader") | ||
zephraph marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| it("should not treat two objects with the same id but different params as different", () => { | ||
| expect(cacheKeyFn({ id: "123" })).not.toEqual( | ||
| cacheKeyFn({ id: "123", foo: "bar" }) | ||
| ) | ||
| }) | ||
|
|
||
| it("should treat two objects with the same params and id as equal", () => { | ||
| expect(cacheKeyFn({ id: "123", foo: "bar" })).toEqual( | ||
| cacheKeyFn({ id: "123", foo: "bar" }) | ||
| ) | ||
| }) | ||
|
|
||
| it("should treat two objects with different ids as different", () => { | ||
| expect(cacheKeyFn({ id: "456", foo: "bar" })).not.toEqual({ | ||
| id: "567", | ||
| foo: "bar", | ||
| }) | ||
| }) | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TIL. Fancy ✨