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
SubscriptionUniqueRootField validation to check multiple fragments - Validation Bug fix #3481
Merged
bbakerman
merged 1 commit into
graphql-java:master
from
Juliano-Prado:fix-SubscriptionUniqueRootField
Mar 10, 2024
Merged
Changes from all commits
Commits
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
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 |
---|---|---|
|
@@ -91,7 +91,7 @@ class SubscriptionUniqueRootFieldTest extends Specification { | |
!validationErrors.empty | ||
validationErrors.size() == 1 | ||
validationErrors[0].validationErrorType == ValidationErrorType.SubscriptionMultipleRootFields | ||
validationErrors[0].message == "Validation error (SubscriptionMultipleRootFields) : Subscription operation 'whoIsAGoodBoy' must have exactly one root field with fragments" | ||
validationErrors[0].message == "Validation error (SubscriptionMultipleRootFields) : Subscription operation 'whoIsAGoodBoy' must have exactly one root field" | ||
} | ||
|
||
def "5.2.3.1 document can contain multiple operations with different root fields"() { | ||
|
@@ -151,9 +151,141 @@ class SubscriptionUniqueRootFieldTest extends Specification { | |
!validationErrors.empty | ||
validationErrors.size() == 1 | ||
validationErrors[0].validationErrorType == ValidationErrorType.SubscriptionIntrospectionRootField | ||
validationErrors[0].message == "Validation error (SubscriptionIntrospectionRootField) : Subscription operation 'doggo' fragment root field '__typename' cannot be an introspection field" | ||
validationErrors[0].message == "Validation error (SubscriptionIntrospectionRootField) : Subscription operation 'doggo' root field '__typename' cannot be an introspection field" | ||
} | ||
|
||
def "5.2.3.1 subscription with multiple root fields within inline fragment are not allowed"() { | ||
given: | ||
def subscriptionOneRootWithFragment = ''' | ||
subscription doggo { | ||
... { | ||
dog { | ||
name | ||
} | ||
cat { | ||
name | ||
} | ||
} | ||
} | ||
''' | ||
|
||
when: | ||
def validationErrors = validate(subscriptionOneRootWithFragment) | ||
|
||
then: | ||
!validationErrors.empty | ||
validationErrors.size() == 1 | ||
validationErrors[0].validationErrorType == ValidationErrorType.SubscriptionMultipleRootFields | ||
validationErrors[0].message == "Validation error (SubscriptionMultipleRootFields) : Subscription operation 'doggo' must have exactly one root field" | ||
} | ||
|
||
|
||
def "5.2.3.1 subscription with more than one root field with multiple fragment fails validation"() { | ||
given: | ||
def subscriptionTwoRootsWithFragment = ''' | ||
fragment doggoRoot on SubscriptionRoot { | ||
...doggoLevel1 | ||
} | ||
|
||
fragment doggoLevel1 on SubscriptionRoot { | ||
...doggoLevel2 | ||
} | ||
|
||
fragment doggoLevel2 on SubscriptionRoot { | ||
dog { | ||
name | ||
} | ||
cat { | ||
name | ||
} | ||
} | ||
|
||
subscription whoIsAGoodBoy { | ||
...doggoRoot | ||
} | ||
''' | ||
when: | ||
def validationErrors = validate(subscriptionTwoRootsWithFragment) | ||
|
||
then: | ||
!validationErrors.empty | ||
validationErrors.size() == 1 | ||
validationErrors[0].validationErrorType == ValidationErrorType.SubscriptionMultipleRootFields | ||
validationErrors[0].message == "Validation error (SubscriptionMultipleRootFields) : Subscription operation 'whoIsAGoodBoy' must have exactly one root field" | ||
} | ||
|
||
|
||
def "5.2.3.1 subscription with more than one root field with multiple fragment with inline fragments fails validation"() { | ||
given: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add this test that was failing before this PR changes. |
||
def subscriptionTwoRootsWithFragment = ''' | ||
fragment doggoRoot on SubscriptionRoot { | ||
...doggoLevel1 | ||
} | ||
|
||
fragment doggoLevel1 on SubscriptionRoot { | ||
...{ | ||
...doggoLevel2 | ||
} | ||
} | ||
|
||
fragment doggoLevel2 on SubscriptionRoot { | ||
...{ | ||
dog { | ||
name | ||
} | ||
cat { | ||
name | ||
} | ||
} | ||
} | ||
|
||
subscription whoIsAGoodBoy { | ||
...doggoRoot | ||
} | ||
''' | ||
when: | ||
def validationErrors = validate(subscriptionTwoRootsWithFragment) | ||
|
||
then: | ||
!validationErrors.empty | ||
validationErrors.size() == 1 | ||
validationErrors[0].validationErrorType == ValidationErrorType.SubscriptionMultipleRootFields | ||
validationErrors[0].message == "Validation error (SubscriptionMultipleRootFields) : Subscription operation 'whoIsAGoodBoy' must have exactly one root field" | ||
} | ||
|
||
|
||
def "5.2.3.1 subscription with one root field with multiple fragment with inline fragments does not fail validation"() { | ||
given: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added just to ensure the valid case of multiple fragments is working fine. |
||
def subscriptionTwoRootsWithFragment = ''' | ||
fragment doggoRoot on SubscriptionRoot { | ||
...doggoLevel1 | ||
} | ||
|
||
fragment doggoLevel1 on SubscriptionRoot { | ||
...{ | ||
...doggoLevel2 | ||
} | ||
} | ||
|
||
fragment doggoLevel2 on SubscriptionRoot { | ||
...{ | ||
dog { | ||
name | ||
} | ||
|
||
} | ||
} | ||
|
||
subscription whoIsAGoodBoy { | ||
...doggoRoot | ||
} | ||
''' | ||
when: | ||
def validationErrors = validate(subscriptionTwoRootsWithFragment) | ||
|
||
then: | ||
validationErrors.empty | ||
} | ||
static List<ValidationError> validate(String query) { | ||
def document = new Parser().parseDocument(query) | ||
return new Validator().validateDocument(SpecValidationSchema.specValidationSchema, document, Locale.ENGLISH) | ||
|
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.
add this test that was failing before this PR changes.