improved internal apitest, added parallel test cases; see #74105

apitest/insert_multi_cs_image.json

@@ -1,9 +1,9 @@
 [
     {
-        "name": "POST /api/v1/db/cs_image",
+        "name": "POST /api/v1/db/cs_image ({{ datastore `n_single_objects` }} objects in one request)",
         "request": {
             "body": [
-                {{ range $idx, $v := N ( datastore "n_single_objects" ) }}
+                {{ range $idx, $v := N ( datastore `n_single_objects` ) }}
                     {{ if gt $idx 0 }}, {{ end }}
                     {
                         "_mask": "cs_image__all_fields",
@@ -26,17 +26,17 @@
                 "order_matters": true
             },
             "body": [
-                {{ range $idx, $v := N ( datastore "n_single_objects" ) }}
+                {{ range $idx, $v := N ( datastore `n_single_objects` ) }}
                     {{ if gt $idx 0 }}, {{ end }}
                     {
                         "cs_image": {
                             "name:control": {
                                 "starts_with": "HU0",
-                                "ends_with": "0{{ add ( add $idx 1 ) ( datastore "n_single_objects" ) }}"
+                                "ends_with": "0{{ add ( add $idx 1 ) ( datastore `n_single_objects` ) }}"
                             },
                             "description:control": {
                                 "starts_with": "DESC: #30",
-                                "ends_with": "{{ add ( add $idx 1 ) ( datastore "n_single_objects" ) }}"
+                                "ends_with": "{{ add ( add $idx 1 ) ( datastore `n_single_objects` ) }}"
                             }
                         }
                     }

apitest/insert_single_cs_image.json

@@ -1,7 +1,7 @@
 [
-    {{ range $idx, $v := N ( datastore "n_single_objects" ) }}
+    {{ range $idx, $v := N ( datastore `n_single_objects` ) }}
         {
-            "name": "POST /api/v1/db/cs_image",
+            "name": "POST /api/v1/db/cs_image (#{{ $idx }})",
             "request": {
                 "body": [
                     {
@@ -36,7 +36,7 @@
                 ],
                 "statuscode": 200
             },
-            "store_response_qjson": {
+            "store_response_gjson": {
                 "cs_image_id_{{ $idx }}": "body.0.cs_image._id",
                 "cs_image_version_{{ $idx }}": "body.0.cs_image._version"
             }

apitest/insert_single_cs_image_parallel.json

@@ -0,0 +1,37 @@
+[
+    {
+        "name": "POST /api/v1/db/cs_image ({{ datastore `n_single_objects` }} parallel object uploads)",
+        "request": {
+            "body": [
+                {
+                    "_mask": "cs_image__all_fields",
+                    "_objecttype": "cs_image",
+                    "cs_image": {
+                        "_version": 1,
+                        "name": null
+                    }
+                }
+            ],
+            "endpoint": "db/cs_image",
+            "method": "POST",
+            "query_params": {
+                "format": "long"
+            }
+        },
+        "response": {
+            "body": [
+                {
+                    "cs_image": {
+                        "name:control": {
+                            "match": "HU0+\\d"
+                        },
+                        "description:control": {
+                            "match": "DESC: #30\\d+"
+                        }
+                    }
+                }
+            ],
+            "statuscode": 200
+        }
+    }
+]

apitest/manifest.json

@@ -1,3 +1,14 @@
+//////////////////////////////////////////////////////
+//                                                  //
+//  This apitest only works if plugin zip exists at //
+//  ../../build/fylr-plugin-sequence.zip            //
+//                                                  //
+//  Run `make zip` before running apitest           //
+//                                                  //
+//////////////////////////////////////////////////////
+
+{{ $n_objects := 5 }}
+
 {
     "name": "fylr-plugin-sequence",
     "header_from_store": {
@@ -12,20 +23,31 @@
         {
             "store": {
                 "as_root": true,
-                "n_single_objects": 3
+                "n_single_objects": {{ $n_objects }}
             }
         }
+
+        // single editor instance saves objects
         , "@setup/all.json"
         , "@testcases.json"
 
+        // parallel saving of objects
+        , "@setup/all.json"
+        , "{{ $n_objects }}@insert_single_cs_image_parallel.json"
 
         // tests with test user account with minimal objecttype permissions
         , {
             "store": {
                 "as_root": false
             }
         }
+
+        // single editor instance saves objects
         , "@setup/all.json"
         , "@testcases.json"
+
+        // parallel saving of objects
+        , "@setup/all.json"
+        , "{{ $n_objects }}@insert_single_cs_image_parallel.json"
     ]
 }

apitest/plugin/all.json

@@ -0,0 +1,6 @@
+[
+    "@put_zip.json",
+    "@wait_for_zip_done.json",
+    "@plugin_init.json",
+    "@enable_plugin.json"
+]

apitest/plugin/enable_plugin.json

@@ -0,0 +1,18 @@
+[
+    {
+        "name": "enable fylr-plugin-sequence plugin",
+        "request": {
+            "endpoint": "plugin/manage/{{ datastore `plugin_id` }}",
+            "method": "POST",
+            "body": {
+                "id": {{ datastore `plugin_id` }},
+                "enabled": true
+            }
+        },
+        "response": {
+            "body": {
+                "enabled": true
+            }
+        }
+    }
+]

apitest/plugin/plugin_init.json

@@ -0,0 +1,31 @@
+[
+    {
+        "name": "PUT /api/v1/plugin/manage",
+        "request": {
+            "body": {
+                "type": "zip",
+                "url": "",
+                "zip_file": {
+                    "_id": {{ datastore `plugin_zip_id` }},
+                    "preferred": true
+                }
+            },
+            "endpoint": "plugin/manage",
+            "method": "PUT"
+        },
+        "response": {
+            "body": {
+                "id:control": {
+                    "is_number": true
+                },
+                "zip_file": {
+                    "_id": {{ datastore `plugin_zip_id` }}
+                }
+            },
+            "statuscode": 200
+        },
+        "store_response_gjson": {
+            "plugin_id": "body.id"
+        }
+    }
+]

apitest/plugin/put_zip.json

@@ -0,0 +1,27 @@
+[
+    {
+        "name": "post build/easydb-plugin-sequence.zip to eas/put",
+        "request": {
+            "body": {
+                "file": "@../../build/fylr-plugin-sequence.zip"
+            },
+            "body_type": "multipart",
+            "endpoint": "eas/put",
+            "method": "POST",
+            "query_params": {
+                "produce_versions": "[false]"
+            }
+        },
+        "response": {
+            "statuscode": 200,
+            "body": [
+                {
+                    "extension": "zip"
+                }
+            ]
+        },
+        "store_response_gjson": {
+            "plugin_zip_id": "body.0._id"
+        }
+    }
+]

apitest/plugin/wait_for_zip_done.json

@@ -0,0 +1,26 @@
+[
+    {
+        "name": "GET /api/v1/eas",
+        "request": {
+            "endpoint": "eas",
+            "method": "GET",
+            "query_params": {
+                "format": "standard",
+                "ids": "[{{ datastore `plugin_zip_id` }}]"
+            }
+        },
+        "response": {
+            "statuscode": 200,
+            "body": {
+                "{{ datastore `plugin_zip_id` }}": {
+                    "_id": {{ datastore `plugin_zip_id` }},
+                    "status": "done",
+                    "extension": "zip",
+                    "is_original": true
+                }
+            }
+        },
+        "timeout_ms": 60000,
+        "delay_ms": 1000
+    }
+]

apitest/setup/POST_datamodel.json

@@ -7,7 +7,7 @@
             },
             "endpoint": "schema/user/HEAD",
             "method": "POST",
-            "body": {{  datastore "setup_datamodel" | qjson "schema" }}
+            "body": {{  datastore "setup_datamodel" | gjson "schema" }}
         }
     }
     ,{
@@ -18,7 +18,7 @@
             },
             "endpoint": "mask/HEAD",
             "method": "POST",
-            "body": {{ datastore "setup_datamodel" | qjson "mask" }}
+            "body": {{ datastore "setup_datamodel" | gjson "mask" }}
         }
     }
     ,{
@@ -29,7 +29,7 @@
             },
             "endpoint": "l10n/user/HEAD",
             "method": "POST",
-            "body": {{ datastore "setup_datamodel" | qjson "keys" }}
+            "body": {{ datastore "setup_datamodel" | gjson "keys" }}
         }
     }
 ]

apitest/setup/all.json

@@ -5,9 +5,9 @@
     // get settings again, after purge we have a new db instance id
     ,"@get_settings.json"
     ,"@root_session.json"
-    ,"@post_config.json"
     ,"@POST_datamodel_commit.json"
-    ,"@plugin_init.json"
+    ,"@../plugin/all.json"
+    ,"@post_config.json"
     {{ if not (datastore `as_root`) }}
         ,"@create_testuser.json"
         ,"@update_objecttype_permissions.json"

apitest/setup/base-config-fylr.json

@@ -2,8 +2,13 @@
     "plugin": {
         "fylr-plugin-sequence": {
             "config": {
-                "fylr-plugin-sequence.insert_sequence.objecttypes": {
-                    "objecttype_settings": [
+                "sequence": {
+                    "objecttype": "sequence",
+                    "ref_field": "sequence.reference",
+                    "num_field": "sequence.number"
+                },
+                "objecttypes": {
+                    "sequence_settings": [
                         {
                             "enabled": true,
                             "update_objecttype": "cs_image",
@@ -28,11 +33,6 @@
                             "only_insert": true
                         }
                     ]
-                },
-                "fylr-plugin-sequence.insert_sequence.sequence": {
-                    "sequence_objecttype": "sequence",
-                    "sequence_ref_field": "sequence.reference",
-                    "sequence_num_field": "sequence.number"
                 }
             }
         }

apitest/setup/create_testuser.json

@@ -48,7 +48,7 @@
     "response": {
         "statuscode": 200
     },
-    "store_response_qjson": {
+    "store_response_gjson": {
         "testuser_id": "body.0.user._id"
     }
 }