New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix cache policy calculation #2197
Merged
glasser
merged 2 commits into
apollographql:master
from
fabsrc:fix/cache-policy-calculation
Jan 22, 2019
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
63 changes: 63 additions & 0 deletions
63
packages/apollo-cache-control/src/__tests__/cacheControlExtension.test.ts
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 |
---|---|---|
@@ -0,0 +1,63 @@ | ||
import { ResponsePath } from 'graphql'; | ||
import { CacheControlExtension, CacheScope } from '../'; | ||
|
||
describe('CacheControlExtension', () => { | ||
let cacheControlExtension: CacheControlExtension; | ||
|
||
beforeEach(() => { | ||
cacheControlExtension = new CacheControlExtension(); | ||
}); | ||
|
||
describe('computeOverallCachePolicy', () => { | ||
const responsePath: ResponsePath = { | ||
key: 'test', | ||
prev: undefined, | ||
}; | ||
const responseSubPath: ResponsePath = { | ||
key: 'subTest', | ||
prev: responsePath, | ||
}; | ||
|
||
it('returns undefined without cache hints', () => { | ||
const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); | ||
expect(cachePolicy).toBeUndefined(); | ||
}); | ||
|
||
it('returns lowest max age value', () => { | ||
cacheControlExtension.addHint(responsePath, { maxAge: 10 }); | ||
cacheControlExtension.addHint(responseSubPath, { maxAge: 20 }); | ||
|
||
const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); | ||
expect(cachePolicy).toHaveProperty('maxAge', 10); | ||
}); | ||
|
||
it('returns undefined if any cache hint has a maxAge of 0', () => { | ||
cacheControlExtension.addHint(responsePath, { maxAge: 120 }); | ||
cacheControlExtension.addHint(responseSubPath, { maxAge: 0 }); | ||
|
||
const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); | ||
expect(cachePolicy).toBeUndefined(); | ||
}); | ||
|
||
it('returns PUBLIC scope by default', () => { | ||
cacheControlExtension.addHint(responsePath, { maxAge: 10 }); | ||
|
||
const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); | ||
expect(cachePolicy).toHaveProperty('scope', CacheScope.Public); | ||
}); | ||
|
||
it('returns PRIVATE scope if any cache hint has PRIVATE scope', () => { | ||
cacheControlExtension.addHint(responsePath, { | ||
maxAge: 10, | ||
scope: CacheScope.Public, | ||
}); | ||
cacheControlExtension.addHint(responseSubPath, { | ||
maxAge: 10, | ||
scope: CacheScope.Private, | ||
}); | ||
|
||
const cachePolicy = cacheControlExtension.computeOverallCachePolicy(); | ||
expect(cachePolicy).toHaveProperty('scope', CacheScope.Private); | ||
}); | ||
}); | ||
}); |
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
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.
Should the check here (before the
?
) also be againstundefined
?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.
Yes, you are right. Didn't check that case in the tests. 😕
Just fixed it and adjusted the test.