Validate expression values for enum-typed properties #5589
Merged
Conversation
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
jfirebaugh
reviewed
Nov 3, 2017
src/style-spec/expression/index.js
Outdated
| @@ -148,6 +153,9 @@ function createExpression(expression: mixed, | |||
| if (val === null || val === undefined) { | |||
| return defaultValue; | |||
| } | |||
| if (enumValues && enumValues.indexOf(val) < 0) { | |||
There was a problem hiding this comment.
Any particular reason to use indexOf here rather than val in values?
| @@ -19,3 +19,26 @@ test('createExpression', (t) => { | |||
|
|
|||
| t.end(); | |||
| }); | |||
|
|
|||
| test('evaluate expression', (t) => { | |||
There was a problem hiding this comment.
Can this be an integration test?
There was a problem hiding this comment.
It started out that way, but the expression tests use the non-error-checking createExpression() so they can check error messages. Since this is a post-evaluation check specific to the error-checking path, it's not a great fit for those tests.
🤔 We could add a render test, though.
anandthakker
force-pushed
the
expression-enums
branch
from
02a8b3c to
03d6859
Compare
|
@jfirebaugh added a render test and switched to |
jfirebaugh
approved these changes
Nov 3, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #5576
Benchmarks: https://bl.ocks.org/anonymous/raw/7a3a7ef8190610345b3c20fdb57abd2c/
(QueryPoint in the above looks like a fluke: https://bl.ocks.org/anonymous/raw/0e24f2c171d51b42356270c3663883b2/)