Commit 8dc35fb
committed
Make schema definition extension modules fully opt-in in specs
Nothing needs the defaulting anymore. The shared spec helpers no longer
apply the JSON ingestion extension to schema definitions; instead, each
place that genuinely needs JSON schemas opts in explicitly:
- `generate_schema_artifacts` includes the extension only when loading
the repository's main test schema (`config/schema.rb`), which uses the
JSON ingestion schema definition DSL.
- `build_indexer` includes the extension when it generates artifacts
itself, since the indexer can only ingest JSON events today. The
require is lazy so bundles without `elasticgraph-json_ingestion` can
still build an indexer from an externally built `datastore_core:`.
- Specs that index documents with inline schemas (and so need JSON
schema validation) pass the extension at their build call sites.
- Vestigial `t.json_schema` calls in unit specs that never index are
removed, along with a `JsonSafeLong` placeholder assertion that
duplicated coverage now living in elasticgraph-json_ingestion.1 parent 5e11583 commit 8dc35fb
19 files changed
Lines changed: 87 additions & 66 deletions
File tree
- elasticgraph-datastore_core/spec/integration/elastic_graph/datastore_core/index_definition
- elasticgraph-graphql/spec
- acceptance
- integration/elastic_graph/graphql
- datastore_query
- resolvers
- unit/elastic_graph/graphql
- resolvers
- scalar_coercion_adapters
- schema
- elasticgraph-indexer/spec/support
- elasticgraph-json_ingestion/spec/unit/elastic_graph/json_ingestion/schema_definition
- indexing
- schema_elements
- elasticgraph-schema_definition/lib/elastic_graph/schema_definition
- spec_support
- lib/elastic_graph/spec_support
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
19 | 26 | | |
20 | 27 | | |
21 | 28 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
91 | 92 | | |
92 | 93 | | |
93 | 94 | | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
94 | 98 | | |
95 | 99 | | |
96 | 100 | | |
| |||
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
88 | | - | |
| 89 | + | |
89 | 90 | | |
90 | 91 | | |
91 | 92 | | |
| |||
elasticgraph-graphql/spec/integration/elastic_graph/graphql/resolvers/nested_relationships_spec.rb
Lines changed: 6 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
19 | | - | |
| 20 | + | |
20 | 21 | | |
21 | 22 | | |
22 | 23 | | |
| |||
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
65 | | - | |
| 66 | + | |
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| |||
241 | 242 | | |
242 | 243 | | |
243 | 244 | | |
244 | | - | |
| 245 | + | |
245 | 246 | | |
246 | 247 | | |
247 | 248 | | |
| |||
381 | 382 | | |
382 | 383 | | |
383 | 384 | | |
384 | | - | |
| 385 | + | |
385 | 386 | | |
386 | 387 | | |
387 | 388 | | |
| |||
573 | 574 | | |
574 | 575 | | |
575 | 576 | | |
576 | | - | |
| 577 | + | |
577 | 578 | | |
578 | 579 | | |
579 | 580 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
447 | 447 | | |
448 | 448 | | |
449 | 449 | | |
450 | | - | |
451 | 450 | | |
452 | 451 | | |
453 | 452 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
23 | 22 | | |
24 | 23 | | |
25 | 24 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
| |||
Lines changed: 0 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
955 | 955 | | |
956 | 956 | | |
957 | 957 | | |
958 | | - | |
959 | 958 | | |
960 | 959 | | |
961 | 960 | | |
| |||
967 | 966 | | |
968 | 967 | | |
969 | 968 | | |
970 | | - | |
971 | 969 | | |
972 | 970 | | |
973 | 971 | | |
| |||
980 | 978 | | |
981 | 979 | | |
982 | 980 | | |
983 | | - | |
984 | 981 | | |
985 | 982 | | |
986 | 983 | | |
| |||
1007 | 1004 | | |
1008 | 1005 | | |
1009 | 1006 | | |
1010 | | - | |
1011 | 1007 | | |
1012 | 1008 | | |
1013 | 1009 | | |
| |||
1016 | 1012 | | |
1017 | 1013 | | |
1018 | 1014 | | |
1019 | | - | |
1020 | 1015 | | |
1021 | 1016 | | |
1022 | 1017 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | 19 | | |
21 | 20 | | |
22 | 21 | | |
| |||
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
15 | 16 | | |
16 | 17 | | |
17 | 18 | | |
18 | | - | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
19 | 25 | | |
20 | 26 | | |
21 | 27 | | |
| |||
0 commit comments