Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6c559ad
Port test for directiveArgumentMergeStrategies
conwuegb Sep 19, 2025
d85bd32
Omit json to simplify test case struct
conwuegb Sep 19, 2025
230b350
Make assert_composition_success() more in line with TS version
conwuegb Sep 19, 2025
98eb302
Run formatter
conwuegb Sep 19, 2025
60ec5b3
Minor comment updates
conwuegb Sep 19, 2025
ab98e85
Merge branch 'dev' into conwuegb/fed-686
conwuegb Oct 23, 2025
05d5a99
Move assert_hints_equal() up to mod level
conwuegb Oct 23, 2025
a1dc015
Merge branch 'dev' into conwuegb/fed-686
conwuegb Oct 24, 2025
3f6bd3b
Merge branch 'dev' of https://github.com/apollographql/router into co…
conwuegb Oct 27, 2025
e4fd7ce
Reset visibility of argument_composition_strategies mod
conwuegb Oct 27, 2025
da5c360
fix(composition): Give correct argument name to merger when merging d…
tninesling Oct 27, 2025
21b883f
Update tests to use public-facing directives.
conwuegb Oct 28, 2025
d5da1fd
Remove test for mismatched composition strategy and argument type
conwuegb Oct 29, 2025
7c414fa
Add test for nullable_max strategy
conwuegb Oct 30, 2025
36961f6
Add test for nullable_and strategy
conwuegb Oct 30, 2025
cf8522d
Add test for nullable_union strategy
conwuegb Oct 30, 2025
5ec1423
Merge branch 'dev' of https://github.com/apollographql/router into co…
conwuegb Oct 30, 2025
25a5ec0
Fix incorrect error code in compose_validation test
conwuegb Oct 30, 2025
5c168b5
Fix incorrect error code in compose_inacessible test
conwuegb Oct 30, 2025
754cb69
Revert change in error code for compose_inaccessible test
conwuegb Oct 31, 2025
df90fe2
Merge branch 'dev' of https://github.com/apollographql/router into co…
conwuegb Oct 31, 2025
85da655
Merge branch 'dev' of https://github.com/apollographql/router into co…
conwuegb Oct 31, 2025
e7b355e
Check error code before checking error msg
conwuegb Oct 31, 2025
db90254
Add useful context to composition errors
conwuegb Oct 31, 2025
081019d
Fix lint errors
conwuegb Oct 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ fn inaccessible_errors_if_subgraph_misuses_inaccessible() {
assert_composition_errors(
&result,
&[(
"REFERENCED_INACCESSIBLE",
"INTERNAL",
r#"The following errors occurred:
- Type `A` is @inaccessible but is referenced by `Query.q2`, which is in the API schema."#,
)],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ fn merge_validations_reject_if_no_subgraphs_have_query() {
assert_composition_errors(
&result,
&[(
"NO_QUERIES",
"QUERY_ROOT_MISSING",
"No queries found in any subgraph: a supergraph must have a query root type.",
)],
);
Expand Down
Loading