refactor: move the skip marker into the heading (#1920)

tailcallhq · May 12, 2024 · b1c49f5 · b1c49f5 · github-actions · May 12, 2024
1 parent 6fbeebc
commit b1c49f5
Show file tree

Hide file tree

Showing 97 changed files with 115 additions and 117 deletions.
diff --git a/tests/core/parse.rs b/tests/core/parse.rs
@@ -84,10 +84,11 @@ impl ExecutionSpec {
                             let split = expect.value.splitn(2, ':').collect::<Vec<&str>>();
                             match split[..] {
                                 [a, b] => {
-                                    check_identity =
-                                        a.contains("check_identity") && b.ends_with("true");
-                                    sdl_error = a.contains("expect_validation_error")
-                                        && b.ends_with("true");
+                                    check_identity = a.contains("identity") && b.ends_with("true");
+                                    sdl_error = a.contains("error") && b.ends_with("true");
+                                    if a.contains("skip") && b.ends_with("true") {
+                                        runner = Some(Annotation::Skip);
+                                    }
                                 }
                                 _ => {
                                     return Err(anyhow!(
@@ -100,31 +101,26 @@ impl ExecutionSpec {
                         }
                     } else if heading.depth == 5 {
                         // Parse annotation
-                        if runner.is_none() {
+                        return if runner.is_none() {
                             if let Some(Node::Text(text)) = heading.children.first() {
-                                runner = Some(match text.value.as_str() {
-                                    "skip" => Annotation::Skip,
-                                    _ => {
-                                        return Err(anyhow!(
-                                            "Unexpected runner annotation {:?} in {:?}",
-                                            text.value,
-                                            path,
-                                        ));
-                                    }
-                                });
+                                Err(anyhow!(
+                                    "Unexpected runner annotation {:?} in {:?}",
+                                    text.value,
+                                    path,
+                                ))
                             } else {
-                                return Err(anyhow!(
+                                Err(anyhow!(
                                     "Unexpected content of level 5 heading in {:?}: {:#?}",
                                     path,
                                     heading
-                                ));
+                                ))
                             }
                         } else {
-                            return Err(anyhow!(
+                            Err(anyhow!(
                                 "Unexpected double-declaration of runner annotation in {:?}",
                                 path
-                            ));
-                        }
+                            ))
+                        };
                     } else if heading.depth == 4 {
                     } else {
                         return Err(anyhow!(

diff --git a/tests/execution/add-field-many-list.md b/tests/execution/add-field-many-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # add-field-many-list

diff --git a/tests/execution/add-field-many.md b/tests/execution/add-field-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # add-field-many

diff --git a/tests/execution/auth-protected-without-auth.md b/tests/execution/auth-protected-without-auth.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Using @protected operator without specifying server.auth config

diff --git a/tests/execution/auth.md b/tests/execution/auth.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # auth

diff --git a/tests/execution/cors-invalid-expose-headers.md b/tests/execution/cors-invalid-expose-headers.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid exposeHeaders

diff --git a/tests/execution/cors-invalid-headers.md b/tests/execution/cors-invalid-headers.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid allowHeaders

diff --git a/tests/execution/cors-invalid-methods.md b/tests/execution/cors-invalid-methods.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid allowMethods

diff --git a/tests/execution/cors-invalid-origins.md b/tests/execution/cors-invalid-origins.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # Cors invalid allowOrigins

diff --git a/tests/execution/experimental-headers-error.md b/tests/execution/experimental-headers-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-experimental-headers-error

diff --git a/tests/execution/graphql-dataloader-batch-keys.md b/tests/execution/graphql-dataloader-batch-keys.md
@@ -1,6 +1,8 @@
-# GraphQL datasource
+---
+skip: true
+---
 
-##### skip
+# GraphQL datasource
 
 [//]: # "nested @graphql directives currently not supported"
 [//]: # "This test had an assertion with a fail annotation that testconv cannot convert losslessly. If you need the original responses, you can find it in git history. For example, at commit https://github.com/tailcallhq/tailcall/tree/1c32ca9e8080ae3b17e9cf41078d028d3e0289da"

diff --git a/tests/execution/inline-many-list.md b/tests/execution/inline-many-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # inline-many-list

diff --git a/tests/execution/inline-many.md b/tests/execution/inline-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # inline-many

diff --git a/tests/execution/input-type-protected-error.md b/tests/execution/input-type-protected-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # input-type-protected-error

diff --git a/tests/execution/omit-many.md b/tests/execution/omit-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # omit-many

diff --git a/tests/execution/test-add-field-error.md b/tests/execution/test-add-field-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-add-field-error

diff --git a/tests/execution/test-add-field-list.md b/tests/execution/test-add-field-list.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-add-field-list

diff --git a/tests/execution/test-add-field.md b/tests/execution/test-add-field.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-add-field

diff --git a/tests/execution/test-add-link-to-empty-config.md b/tests/execution/test-add-link-to-empty-config.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-add-link-to-empty-config

diff --git a/tests/execution/test-all-blueprint-errors.md b/tests/execution/test-all-blueprint-errors.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-all-blueprint-errors

diff --git a/tests/execution/test-batch-operator-post.md b/tests/execution/test-batch-operator-post.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-batch-operator-post

diff --git a/tests/execution/test-batching-group-by.md b/tests/execution/test-batching-group-by.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-batching-group-by

diff --git a/tests/execution/test-cache.md b/tests/execution/test-cache.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-cache

diff --git a/tests/execution/test-call-operator-errors.md b/tests/execution/test-call-operator-errors.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-call-operator

diff --git a/tests/execution/test-custom-scalar.md b/tests/execution/test-custom-scalar.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-custom-scalar

diff --git a/tests/execution/test-custom-types.md b/tests/execution/test-custom-types.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-custom-types

diff --git a/tests/execution/test-dbl-usage-many.md b/tests/execution/test-dbl-usage-many.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-dbl-usage-many

diff --git a/tests/execution/test-dbl-usage.md b/tests/execution/test-dbl-usage.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-dbl-usage

diff --git a/tests/execution/test-description-many.md b/tests/execution/test-description-many.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-description-many

diff --git a/tests/execution/test-directives-undef-null-fields.md b/tests/execution/test-directives-undef-null-fields.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-directives-undef-null-fields

diff --git a/tests/execution/test-duplicated-link.md b/tests/execution/test-duplicated-link.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-duplicated-link

diff --git a/tests/execution/test-empty-link.md b/tests/execution/test-empty-link.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-empty-link

diff --git a/tests/execution/test-enum-description.md b/tests/execution/test-enum-description.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-enum-description

diff --git a/tests/execution/test-enum-empty.md b/tests/execution/test-enum-empty.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-enum-empty

diff --git a/tests/execution/test-enum.md b/tests/execution/test-enum.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-enum

diff --git a/tests/execution/test-expr-error.md b/tests/execution/test-expr-error.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-expr-error

diff --git a/tests/execution/test-expr-with-add-field.md b/tests/execution/test-expr-with-add-field.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-expr-with-add-field

diff --git a/tests/execution/test-expr-with-inline.md b/tests/execution/test-expr-with-inline.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-expr-with-inline

diff --git a/tests/execution/test-expr.md b/tests/execution/test-expr.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-expr

diff --git a/tests/execution/test-field-already-implemented-from-Interface.md b/tests/execution/test-field-already-implemented-from-Interface.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-field-already-implemented-from-Interface

diff --git a/tests/execution/test-graphqlsource-no-base-url.md b/tests/execution/test-graphqlsource-no-base-url.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-graphqlsource-no-base-url

diff --git a/tests/execution/test-graphqlsource.md b/tests/execution/test-graphqlsource.md
@@ -1,5 +1,5 @@
 ---
-check_identity: true
+identity: true
 ---
 
 # test-graphqlsource

diff --git a/tests/execution/test-groupby-without-batching.md b/tests/execution/test-groupby-without-batching.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-groupby-without-batching

diff --git a/tests/execution/test-grpc-group-by.md b/tests/execution/test-grpc-group-by.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-group-by

diff --git a/tests/execution/test-grpc-invalid-method-format.md b/tests/execution/test-grpc-invalid-method-format.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-invalid-method-format

diff --git a/tests/execution/test-grpc-invalid-proto-id.md b/tests/execution/test-grpc-invalid-proto-id.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-invalid-proto-id

diff --git a/tests/execution/test-grpc-missing-fields.md b/tests/execution/test-grpc-missing-fields.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-missing-fields

diff --git a/tests/execution/test-grpc-nested-data.md b/tests/execution/test-grpc-nested-data.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-nested-data

diff --git a/tests/execution/test-grpc-nested-optional.md b/tests/execution/test-grpc-nested-optional.md
@@ -1,5 +1,5 @@
 ---
-expect_validation_error: true
+error: true
 ---
 
 # test-grpc-nested-optional
Thread Stats	Avg	Stdev	Max	+/- Stdev
Latency	7.03ms	3.11ms	78.63ms	71.49%
Req/Sec	3.60k	131.86	4.10k	89.33%