@tellescope/sdk 1.67.5 → 1.67.7

package/lib/esm/tests/tests.js

@@ -877,18 +877,24 @@ var run_generated_tests = function (_a) {
                 case 5: return [4 /*yield*/, async_test("create-".concat(singularName), function () { return queries.createOne(instance); }, { onResult: function (r) { return !!(_id = r.id) && (name === 'api_keys' || !!r.creator) && validateReturnType(returns.create, r, defaultValidation); } })];
                 case 6:
                     _c.sent();
-                    return [4 /*yield*/, async_test("log-".concat(singularName, " create"), function () { return sdk.api.user_logs.getOne({ resourceId: _id, resource: name, action: 'create' }); }, { onResult: function (r) { return r && r.userId === sdk.userInfo.id; } })];
+                    return [4 /*yield*/, wait(undefined, 25)];
                 case 7:
                     _c.sent();
-                    if (!model.defaultActions.update) return [3 /*break*/, 10];
-                    return [4 /*yield*/, async_test("update-".concat(singularName), function () { return queries.updateOne(_id, updates, { replaceObjectFields: true }); }, { onResult: function (u) { return typeof u === 'object' && u.id === _id; } })];
+                    return [4 /*yield*/, async_test("log-".concat(singularName, " create"), function () { return sdk.api.user_logs.getOne({ resourceId: _id, resource: name, action: 'create' }); }, { onResult: function (r) { return r && r.userId === sdk.userInfo.id; } })];
                 case 8:
                     _c.sent();
-                    return [4 /*yield*/, async_test("log-".concat(singularName, " update"), function () { return sdk.api.user_logs.getOne({ resourceId: _id, resource: name, action: 'update' }); }, { onResult: function (r) { return r && r.userId === sdk.userInfo.id; } })];
+                    if (!model.defaultActions.update) return [3 /*break*/, 12];
+                    return [4 /*yield*/, async_test("update-".concat(singularName), function () { return queries.updateOne(_id, updates, { replaceObjectFields: true }); }, { onResult: function (u) { return typeof u === 'object' && u.id === _id; } })];
                 case 9:
                     _c.sent();
-                    _c.label = 10;
-                case 10: return [4 /*yield*/, async_test("get-".concat(singularName), function () { return queries.getOne(_id); }, { onResult: function (d) {
+                    return [4 /*yield*/, wait(undefined, 25)];
+                case 10:
+                    _c.sent();
+                    return [4 /*yield*/, async_test("log-".concat(singularName, " update"), function () { return sdk.api.user_logs.getOne({ resourceId: _id, resource: name, action: 'update' }); }, { onResult: function (r) { return r && r.userId === sdk.userInfo.id; } })];
+                case 11:
+                    _c.sent();
+                    _c.label = 12;
+                case 12: return [4 /*yield*/, async_test("get-".concat(singularName), function () { return queries.getOne(_id); }, { onResult: function (d) {
                             if (!(d === null || d === void 0 ? void 0 : d.id))
                                 return false;
                             for (var k in instance) {
@@ -899,7 +905,7 @@ var run_generated_tests = function (_a) {
                             return true;
                         }
                     })];
-                case 11:
+                case 13:
                     _c.sent();
                     return [4 /*yield*/, async_test("get-".concat(safeName), function () { return queries.getSome({ filter: filter }); }, { onResult: function (_a) {
                                 var d = _a[0];
@@ -914,27 +920,30 @@ var run_generated_tests = function (_a) {
                                 return true;
                             }
                         })];
-                case 12:
+                case 14:
                     _c.sent();
                     return [4 /*yield*/, async_test("delete-".concat(singularName), function () { return queries.deleteOne(_id); }, passOnVoid)];
-                case 13:
+                case 15:
+                    _c.sent();
+                    return [4 /*yield*/, wait(undefined, 25)];
+                case 16:
                     _c.sent();
                     return [4 /*yield*/, async_test("get-".concat(singularName, " (verify delete)"), function () { return queries.getOne(_id); }, { shouldError: true, onError: function (e) { return e.message === 'Could not find a record for the given id'; } })
                         // lots of side effects
                     ];
-                case 14:
+                case 17:
                     _c.sent();
-                    if (!(name === 'endusers')) return [3 /*break*/, 16];
+                    if (!(name === 'endusers')) return [3 /*break*/, 19];
                     return [4 /*yield*/, wait(undefined, 100)];
-                case 15:
+                case 18:
                     _c.sent();
-                    return [3 /*break*/, 18];
-                case 16: return [4 /*yield*/, wait(undefined, 50)];
-                case 17:
+                    return [3 /*break*/, 21];
+                case 19: return [4 /*yield*/, wait(undefined, 50)];
+                case 20:
                     _c.sent();
-                    _c.label = 18;
-                case 18: return [4 /*yield*/, async_test("log-".concat(singularName, " delete"), function () { return sdk.api.user_logs.getOne({ resourceId: _id, resource: name, action: 'delete' }); }, { onResult: function (r) { return r && r.userId === sdk.userInfo.id; } })];
-                case 19:
+                    _c.label = 21;
+                case 21: return [4 /*yield*/, async_test("log-".concat(singularName, " delete"), function () { return sdk.api.user_logs.getOne({ resourceId: _id, resource: name, action: 'delete' }); }, { onResult: function (r) { return r && r.userId === sdk.userInfo.id; } })];
+                case 22:
                     _c.sent();
                     return [2 /*return*/];
             }
@@ -1898,21 +1907,24 @@ var files_tests = function () { return __awaiter(void 0, void 0, void 0, functio
                 return [4 /*yield*/, enduserSDK.authenticate(email, password).catch(console.error)];
             case 3:
                 _c.sent();
+                return [4 /*yield*/, sdkNonAdmin.authenticate(nonAdminEmail, nonAdminPassword)]; // to use new role, handle logout on role change
+            case 4:
+                _c.sent(); // to use new role, handle logout on role change
                 buff = buffer.Buffer.from('test file data');
                 return [4 /*yield*/, async_test("non admin can prepare file upload", function () { return sdkNonAdmin.api.files.prepare_file_upload({
                         name: 'Test File', size: buff.byteLength, type: 'text/plain'
                     }); }, { onResult: function (t) { return true; } })];
-            case 4:
+            case 5:
                 _c.sent();
                 return [4 /*yield*/, sdk.api.files.prepare_file_upload({
                         name: 'Test Private', size: buff.byteLength, type: 'text/plain', enduserId: enduser.id,
                     })];
-            case 5:
+            case 6:
                 _a = _c.sent(), presignedUpload = _a.presignedUpload, file = _a.file;
                 return [4 /*yield*/, sdk.api.files.prepare_file_upload({
                         name: 'Test Private (no enduser)', size: buff.byteLength, type: 'text/plain',
                     })];
-            case 6:
+            case 7:
                 _b = _c.sent(), presignedNonEnduser = _b.presignedUpload, fileNonEnduser = _b.file;
                 return [4 /*yield*/, sdk.api.files.prepare_file_upload({
                         name: 'Test Public', size: buff.byteLength, type: 'text/plain',
@@ -1920,62 +1932,62 @@ var files_tests = function () { return __awaiter(void 0, void 0, void 0, functio
                         publicRead: true,
                         publicName: 'public',
                     })];
-            case 7:
+            case 8:
                 presigned2 = (_c.sent()).presignedUpload;
                 return [4 /*yield*/, sdk.UPLOAD(
                     // @ts-ignore
                     presignedUpload, buff)];
-            case 8:
+            case 9:
                 _c.sent();
                 return [4 /*yield*/, sdk.UPLOAD(
                     // @ts-ignore
                     presignedNonEnduser, buff)];
-            case 9:
+            case 10:
                 _c.sent();
                 return [4 /*yield*/, sdk.UPLOAD(
                     // @ts-ignore
                     presigned2, buff)];
-            case 10:
+            case 11:
                 _c.sent();
                 return [4 /*yield*/, async_test("Files associated with enduser on prepare_file_upload", function () { return sdk.api.files.getSome({ filter: { enduserId: enduser.id } }); }, { onResult: function (fs) { return fs.length === 2; } })];
-            case 11:
+            case 12:
                 _c.sent();
                 return [4 /*yield*/, sdk.api.files.file_download_URL({ secureName: file.secureName })];
-            case 12:
+            case 13:
                 downloadURL = (_c.sent()).downloadURL;
                 return [4 /*yield*/, sdk.DOWNLOAD(downloadURL)];
-            case 13:
+            case 14:
                 downloaded = _c.sent();
                 assert(downloaded === buff.toString(), 'downloaded file does not match uploaded file', 'upload, download comparison');
                 return [4 /*yield*/, sdk.api.files.file_download_URL({ secureName: file.secureName })];
-            case 14:
+            case 15:
                 cachedURL = (_c.sent()).downloadURL;
                 assert(downloadURL === cachedURL, 'cache download url failed', 'download url cache');
                 return [4 /*yield*/, enduserSDK.api.files.file_download_URL({ secureName: file.secureName })];
-            case 15:
+            case 16:
                 urlForEnduser = (_c.sent()).downloadURL;
                 assert(downloadURL === urlForEnduser, 'failed to get download url for enduser', 'download url for enduser');
                 return [4 /*yield*/, Promise.all([
                         sdk.api.endusers.deleteOne(enduser.id),
                     ])];
-            case 16:
+            case 17:
                 _c.sent();
                 return [4 /*yield*/, wait(undefined, 2000)]; // wait for files to be deleted as side effect
-            case 17:
+            case 18:
                 _c.sent(); // wait for files to be deleted as side effect
                 return [4 /*yield*/, async_test("Files cleaned up as side effect of deleting enduser", function () { return sdk.api.files.getSome({ filter: { enduserId: enduser.id } }); }, { onResult: function (fs) { return fs.length === 0; } })];
-            case 18:
+            case 19:
                 _c.sent();
                 return [4 /*yield*/, async_test("Non-enduser file is left", function () { return sdk.api.files.getSome(); }, { onResult: function (fs) { return fs.length > 0; } })
                     // cleanup other file
                 ];
-            case 19:
+            case 20:
                 _c.sent();
                 // cleanup other file
                 return [4 /*yield*/, Promise.all([
                         sdk.api.files.deleteOne(fileNonEnduser.id),
                     ])];
-            case 20:
+            case 21:
                 // cleanup other file
                 _c.sent();
                 return [2 /*return*/];
@@ -2416,11 +2428,8 @@ var ticketEventTests = function () { return __awaiter(void 0, void 0, void 0, fu
                 return [4 /*yield*/, sdk.api.endusers.updateOne(enduserWithTeam.id, { journeys: (_b = {}, _b[nullJourney.id] = 'Added (Null)', _b) })];
             case 16:
                 _c.sent();
-                return [4 /*yield*/, wait(undefined, 2250)]; // wait for tickets to be automatically created
+                return [4 /*yield*/, async_test("Tickets automatically created", function () { return pollForResults(sdk.api.tickets.getSome, function (tickets) { return (tickets === null || tickets === void 0 ? void 0 : tickets.length) === 2; }, 500, 15); }, passOnAnyResult)];
             case 17:
-                _c.sent(); // wait for tickets to be automatically created
-                return [4 /*yield*/, async_test("Tickets automatically created", function () { return sdk.api.tickets.getSome(); }, { onResult: function (tickets) { return (tickets === null || tickets === void 0 ? void 0 : tickets.length) === 2; } })];
-            case 18:
                 _c.sent();
                 return [4 /*yield*/, async_test("Ticket for enduser, default assignment, testCloseReasons", function () { return sdk.api.tickets.getSome({ filter: { enduserId: enduser.id } }); }, { onResult: function (tickets) {
                             var _a;
@@ -2428,10 +2437,10 @@ var ticketEventTests = function () { return __awaiter(void 0, void 0, void 0, fu
                                 && ((_a = tickets[0].closeReasons) === null || _a === void 0 ? void 0 : _a.length) === 3
                                 && tickets[0].owner === sdk.userInfo.id);
                         } })];
-            case 19:
+            case 18:
                 _c.sent();
                 return [4 /*yield*/, sdk.api.tickets.getOne({ enduserId: enduser.id })];
-            case 20:
+            case 19:
                 ticket = _c.sent();
                 return [4 /*yield*/, async_test("Ticket for enduser, care team assignment, no reasons", function () { return sdk.api.tickets.getSome({ filter: { enduserId: enduserWithTeam.id } }); }, { onResult: function (tickets) {
                             var _a;
@@ -2440,19 +2449,19 @@ var ticketEventTests = function () { return __awaiter(void 0, void 0, void 0, fu
                                 && tickets[0].owner === sdkNonAdmin.userInfo.id;
                         }
                     })];
-            case 21:
+            case 20:
                 _c.sent();
                 return [4 /*yield*/, sdk.api.tickets.getOne({ enduserId: enduserWithTeam.id })];
-            case 22:
+            case 21:
                 ticketNull = _c.sent();
                 return [4 /*yield*/, sdk.api.tickets.updateOne(ticket.id, { closedForReason: 'Maybe', closedAt: new Date() })];
-            case 23:
+            case 22:
                 _c.sent();
                 return [4 /*yield*/, sdk.api.tickets.updateOne(ticketNull.id, { closedAt: new Date() })];
-            case 24:
+            case 23:
                 _c.sent();
                 return [4 /*yield*/, wait(undefined, 250)]; // wait for actions to be automatically created
-            case 25:
+            case 24:
                 _c.sent(); // wait for actions to be automatically created
                 return [4 /*yield*/, async_test("Automated actions for handle ticket created", function () { return sdk.api.automated_actions.getSome(); }, { onResult: (function (actions) { return (actions === null || actions === void 0 ? void 0 : actions.length) === 4 // ticket creations + ticket completions = 2 + 2
                             && (!!actions.find(function (a) {
@@ -2469,7 +2478,7 @@ var ticketEventTests = function () { return __awaiter(void 0, void 0, void 0, fu
                                     && a.action.info.status === 'Null';
                             } // null branch when completed without closedForReason
                             )); }) })];
-            case 26:
+            case 25:
                 _c.sent();
                 return [4 /*yield*/, Promise.all([
                         sdk.api.journeys.deleteOne(journey.id),
@@ -2479,7 +2488,7 @@ var ticketEventTests = function () { return __awaiter(void 0, void 0, void 0, fu
                         sdk.api.tickets.deleteOne(ticket.id),
                         sdk.api.tickets.deleteOne(ticketNull.id),
                     ])];
-            case 27:
+            case 26:
                 _c.sent();
                 return [2 /*return*/];
         }
@@ -2548,17 +2557,14 @@ var removeFromJourneyTests = function () { return __awaiter(void 0, void 0, void
                 return [4 /*yield*/, async_test("Next step not trigged early", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) !== 'Delayed Step'; } })];
             case 10:
                 _b.sent();
-                return [4 /*yield*/, wait(undefined, 4 * TEST_DELAY)]; // wait long enough for automation to process and delay to pass
+                return [4 /*yield*/, async_test("Sequenced action triggered", function () { return pollForResults(function () { return sdk.api.endusers.getOne(enduser.id); }, function (e) { var _a; return ((_a = e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'Delayed Step'; }, TEST_DELAY, 15); }, passOnAnyResult)];
             case 11:
-                _b.sent(); // wait long enough for automation to process and delay to pass
-                return [4 /*yield*/, async_test("Sequenced action triggered", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'Delayed Step'; } })];
-            case 12:
                 _b.sent();
                 return [4 /*yield*/, Promise.all([
                         sdk.api.journeys.deleteOne(journey.id),
                         sdk.api.endusers.deleteOne(enduser.id),
                     ])];
-            case 13:
+            case 12:
                 _b.sent();
                 return [2 /*return*/];
         }
@@ -2789,14 +2795,11 @@ export var formUnsubmittedCancelConditionTest = function () { return __awaiter(v
             case 10:
                 accessCode = (_a.sent()).accessCode;
                 // allow fast followup to trigger
-                return [4 /*yield*/, wait(undefined, 4000)]; // allow background creation with generous pause
-            case 11:
-                // allow fast followup to trigger
-                _a.sent(); // allow background creation with generous pause
-                return [4 /*yield*/, async_test("formUnsubmitted event with short delay is triggered", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'triggered again'; } })
+                return [4 /*yield*/, async_test("formUnsubmitted event with short delay is triggered", function () { return pollForResults(function () { return sdk.api.endusers.getOne(enduser.id); }, function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'triggered again'; }, 1000, 10); }, passOnAnyResult)
                     // trigger cancel conditions
                 ];
-            case 12:
+            case 11:
+                // allow fast followup to trigger
                 _a.sent();
                 // trigger cancel conditions
                 return [4 /*yield*/, sdk.api.form_responses.submit_form_response({ accessCode: accessCode, automationStepId: triggerStep.id, responses: [{
@@ -2807,11 +2810,11 @@ export var formUnsubmittedCancelConditionTest = function () { return __awaiter(v
                                 fieldId: field.id,
                                 fieldTitle: field.title,
                             }] })];
-            case 13:
+            case 12:
                 // trigger cancel conditions
                 _a.sent();
                 return [4 /*yield*/, wait(undefined, 1500)]; // allow background creation with generous pause
-            case 14:
+            case 13:
                 _a.sent(); // allow background creation with generous pause
                 return [4 /*yield*/, async_test("Cancel conditions work for followup", function () { return sdk.api.automated_actions.getSome(); }, { onResult: function (as) {
                             var _a, _b;
@@ -2821,14 +2824,14 @@ export var formUnsubmittedCancelConditionTest = function () { return __awaiter(v
                                 && as.filter(function (a) { return a.status === 'cancelled'; }).length === 2;
                         }
                     })];
-            case 15:
+            case 14:
                 _a.sent();
                 return [4 /*yield*/, Promise.all([
                         sdk.api.forms.deleteOne(form.id),
                         sdk.api.journeys.deleteOne(journey.id),
                         sdk.api.endusers.deleteOne(enduser.id)
                     ])];
-            case 16:
+            case 15:
                 _a.sent();
                 return [2 /*return*/];
         }
@@ -3007,7 +3010,7 @@ export var formsUnsubmittedCancelConditionTest = function () { return __awaiter(
                         } })];
             case 19:
                 _a.sent();
-                return [4 /*yield*/, async_test("formResponses triggered after both forms submitted", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'formsSubmitted'; } })];
+                return [4 /*yield*/, async_test("formResponses triggered after both forms submitted", function () { return pollForResults(function () { return sdk.api.endusers.getOne(enduser.id); }, function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'formsSubmitted'; }, 500, 10); }, passOnAnyResult)];
             case 20:
                 _a.sent();
                 return [4 /*yield*/, Promise.all([
@@ -3107,20 +3110,13 @@ export var formsUnsubmittedTest = function () { return __awaiter(void 0, void 0,
             case 8:
                 // triggers formsUnsubmitted automated actions to be created when forms generated in templated message
                 _a.sent();
-                return [4 /*yield*/, sdk.api.form_responses.getSome()
-                    // allow fast followup to trigger
-                ];
+                return [4 /*yield*/, sdk.api.form_responses.getSome()];
             case 9:
                 form_responses = _a.sent();
-                // allow fast followup to trigger
-                return [4 /*yield*/, wait(undefined, 5000)]; // allow background creation with generous pause
-            case 10:
-                // allow fast followup to trigger
-                _a.sent(); // allow background creation with generous pause
-                return [4 /*yield*/, async_test("formsUnsubmitted handler worked", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'triggered'; } })
+                return [4 /*yield*/, async_test("formsUnsubmitted handler worked", function () { return pollForResults(function () { return sdk.api.endusers.getOne(enduser.id); }, function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'triggered'; }, 1000, 10); }, passOnAnyResult)
                     // trigger cancel conditions
                 ];
-            case 11:
+            case 10:
                 _a.sent();
                 // trigger cancel conditions
                 return [4 /*yield*/, sdk.api.form_responses.submit_form_response({ accessCode: form_responses[0].accessCode, automationStepId: triggerStep.id, responses: [{
@@ -3131,14 +3127,14 @@ export var formsUnsubmittedTest = function () { return __awaiter(void 0, void 0,
                                 fieldId: field.id,
                                 fieldTitle: field.title,
                             }] })];
-            case 12:
+            case 11:
                 // trigger cancel conditions
                 _a.sent();
                 return [4 /*yield*/, wait(undefined, 5000)]; // allow background creation with generous pause
-            case 13:
+            case 12:
                 _a.sent(); // allow background creation with generous pause
                 return [4 /*yield*/, async_test("formResponses not triggered yet after 1 form remaining", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) !== 'formsSubmitted'; } })];
-            case 14:
+            case 13:
                 _a.sent();
                 return [4 /*yield*/, sdk.api.form_responses.submit_form_response({ accessCode: form_responses[1].accessCode, automationStepId: triggerStep.id, responses: [{
                                 answer: {
@@ -3148,20 +3144,20 @@ export var formsUnsubmittedTest = function () { return __awaiter(void 0, void 0,
                                 fieldId: field.id,
                                 fieldTitle: field.title,
                             }] })];
-            case 15:
+            case 14:
                 _a.sent();
                 return [4 /*yield*/, wait(undefined, 5000)]; // allow background creation with generous pause
-            case 16:
+            case 15:
                 _a.sent(); // allow background creation with generous pause
                 return [4 /*yield*/, async_test("formResponses triggered after both forms submitted", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e === null || e === void 0 ? void 0 : e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === 'formsSubmitted'; } })];
-            case 17:
+            case 16:
                 _a.sent();
                 return [4 /*yield*/, Promise.all([
                         sdk.api.forms.deleteOne(form.id),
                         sdk.api.journeys.deleteOne(journey.id),
                         sdk.api.endusers.deleteOne(enduser.id)
                     ])];
-            case 18:
+            case 17:
                 _a.sent();
                 return [2 /*return*/];
         }
@@ -3367,33 +3363,35 @@ var addToJourneyTests = function () { return __awaiter(void 0, void 0, void 0, f
             case 5:
                 // add to journey and re-add
                 _a.sent();
-                return [4 /*yield*/, async_test("Journey state correctly set by add_to_journey (to default state)", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a, _b; return ((_a = e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === '' || ((_b = e.journeys) === null || _b === void 0 ? void 0 : _b[journey.id]) === 'Root'; } })];
+                return [4 /*yield*/, async_test("Journey state correctly set by add_to_journey (to default state)", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a, _b; return ((_a = e.journeys) === null || _a === void 0 ? void 0 : _a[journey.id]) === '' || ((_b = e.journeys) === null || _b === void 0 ? void 0 : _b[journey.id]) === 'Root'; } })
+                    // ensure that second step is generated before first is cancelled
+                ];
             case 6:
                 _a.sent();
-                return [4 /*yield*/, wait(undefined, 4000)]; // allow onJourneyStart step to trigger
+                // ensure that second step is generated before first is cancelled
+                return [4 /*yield*/, pollForResults(sdk.api.automated_actions.getSome, function (es) { return es.length === 2; }, 100, 50)];
             case 7:
-                _a.sent(); // allow onJourneyStart step to trigger
+                // ensure that second step is generated before first is cancelled
+                _a.sent();
                 return [4 /*yield*/, sdk.api.endusers.add_to_journey({ enduserIds: [enduser.id], journeyId: journey.id })];
             case 8:
+                // ensure that second step is generated before first is cancelled
                 _a.sent();
-                return [4 /*yield*/, async_test("Enduser throttle journey add working", function () { return sdk.api.endusers.add_to_journey({ enduserIds: [enduser.id], journeyId: journey.id, throttle: true }); }, handleAnyError)];
+                return [4 /*yield*/, async_test("Enduser correctly added and re-added", function () { return pollForResults(sdk.api.automated_actions.getSome, function (es) { return (es.length === 4
+                        && es.filter(function (e) { return e.status === 'cancelled' && e.automationStepId === follow.id; }).length === 1 // one afterAction is cancelled
+                        && es.filter(function (e) { return e.status === 'active' && e.automationStepId === follow.id; }).length === 1 // one afterAction is still active
+                        && es.filter(function (e) { return e.status === 'finished' && e.automationStepId === root.id; }).length === 2 // two initial onJourneyStart
+                    ); }, 250, 40); }, passOnAnyResult)];
             case 9:
                 _a.sent();
-                return [4 /*yield*/, wait(undefined, 4000)]; // allow onJourneyStart step to trigger
+                return [4 /*yield*/, async_test("Enduser throttle journey add working", function () { return sdk.api.endusers.add_to_journey({ enduserIds: [enduser.id], journeyId: journey.id, throttle: true }); }, handleAnyError)];
             case 10:
-                _a.sent(); // allow onJourneyStart step to trigger
-                return [4 /*yield*/, async_test("Enduser correctly added and re-added", function () { return sdk.api.automated_actions.getSome(); }, { onResult: function (es) { return es.length === 4
-                            && es.filter(function (e) { return e.status === 'cancelled' && e.automationStepId === follow.id; }).length === 1 // one afterAction is cancelled
-                            && es.filter(function (e) { return e.status === 'active' && e.automationStepId === follow.id; }).length === 1 // one afterAction is still active
-                            && es.filter(function (e) { return e.status === 'finished' && e.automationStepId === root.id; }).length === 2; } // two initial onJourneyStart
-                    })];
-            case 11:
                 _a.sent();
                 return [4 /*yield*/, Promise.all([
                         sdk.api.journeys.deleteOne(journey.id),
                         sdk.api.endusers.deleteOne(enduser.id),
                     ])];
-            case 12:
+            case 11:
                 _a.sent();
                 return [2 /*return*/];
         }
@@ -3425,20 +3423,17 @@ var directAutomatedActionTest = function () { return __awaiter(void 0, void 0, v
                     })];
             case 2:
                 action = _a.sent();
-                return [4 /*yield*/, wait(undefined, 3000)];
+                return [4 /*yield*/, async_test("Enduser status set by manual automated action", function () { return pollForResults(function () { return sdk.api.endusers.getOne(enduser.id); }, function (e) { var _a; return ((_a = e.journeys) === null || _a === void 0 ? void 0 : _a[PLACEHOLDER_ID]) === 'Working'; }, 1000, 10); }, passOnAnyResult)];
             case 3:
-                _a.sent();
-                return [4 /*yield*/, async_test("Enduser status set by manual automated action", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return ((_a = e.journeys) === null || _a === void 0 ? void 0 : _a[PLACEHOLDER_ID]) === 'Working'; } })];
-            case 4:
                 _a.sent();
                 return [4 /*yield*/, async_test("Automated action is finished", function () { return sdk.api.automated_actions.getOne(action.id); }, { onResult: function (e) { return e.status === 'finished'; } })];
-            case 5:
+            case 4:
                 _a.sent();
                 return [4 /*yield*/, Promise.all([
                         sdk.api.endusers.deleteOne(enduser.id),
                         sdk.api.automated_actions.deleteOne(action.id),
                     ])];
-            case 6:
+            case 5:
                 _a.sent();
                 return [2 /*return*/];
         }
@@ -5153,29 +5148,26 @@ var run_autoreply_test = function (title, _a) {
                     return [4 /*yield*/, enduserSDK.api.chats.createOne({ roomId: room.id, message: 'enduser' })];
                 case 8:
                     _b.sent();
-                    return [4 /*yield*/, wait(undefined, 50)];
+                    return [4 /*yield*/, async_test('Main test', function () { return pollForResults(function () { return sdk.api.chats.getSome({ filter: { roomId: room.id } }); }, function (cs) { return (expectingAutoreply
+                            ? cs.length === 3
+                            : cs.length === 2); }, 25, 10); }, passOnAnyResult)];
                 case 9:
-                    _b.sent();
-                    return [4 /*yield*/, async_test('Main test', function () { return sdk.api.chats.getSome({ filter: { roomId: room.id } }); }, { onResult: function (cs) { return (expectingAutoreply
-                                ? cs.length === 3
-                                : cs.length === 2); } })];
-                case 10:
                     _b.sent();
                     return [4 /*yield*/, enduserSDK.api.chats.createOne({ roomId: room.id, message: 'enduser again' })];
-                case 11:
+                case 10:
                     _b.sent();
                     return [4 /*yield*/, wait(undefined, 50)];
-                case 12:
+                case 11:
                     _b.sent();
                     return [4 /*yield*/, async_test("Duplicate autoreply avoided", function () { return sdk.api.chats.getSome({ filter: { roomId: room.id } }); }, { onResult: function (cs) { return (expectingAutoreply
                                 ? cs.length === 4
                                 : cs.length === 3); } })
                         // cleanup, including any availability blocks
                     ];
-                case 13:
+                case 12:
                     _b.sent();
                     return [4 /*yield*/, sdk.api.availability_blocks.getSome()];
-                case 14:
+                case 13:
                     blocks = _b.sent();
                     return [4 /*yield*/, Promise.all(__spreadArray([
                             sdk.api.endusers.deleteOne(enduser.id),
@@ -5187,7 +5179,7 @@ var run_autoreply_test = function (title, _a) {
                                 replaceObjectFields: true
                             })
                         ], blocks.map(function (b) { return (sdk.api.availability_blocks.deleteOne(b.id)); }), true))];
-                case 15:
+                case 14:
                     _b.sent();
                     return [2 /*return*/];
             }
@@ -5510,14 +5502,11 @@ var wait_for_trigger_tests = function () { return __awaiter(void 0, void 0, void
                 // cleanup
                 _b.sent();
                 // test trigger cleaned up on journey delete
-                return [4 /*yield*/, wait(undefined, 150)];
-            case 15:
-                // test trigger cleaned up on journey delete
-                _b.sent();
-                return [4 /*yield*/, async_test("Trigger did not fire while not journey", function () { return sdk.api.automation_triggers.getOne(trigger.id); }, handleAnyError)
+                return [4 /*yield*/, async_test("Trigger cleaned up by journey deletion", function () { return pollForResults(sdk.api.automation_triggers.getSome, function (results) { return !results.find(function (r) { return r.id === trigger.id; }); }, 100, 10); }, passOnAnyResult)
                     // double-check that wait for trigger step triggers were deleted
                 ];
-            case 16:
+            case 15:
+                // test trigger cleaned up on journey delete
                 _b.sent();
                 return [2 /*return*/];
         }
@@ -5688,41 +5677,37 @@ var remove_from_journey_on_incoming_comms_tests = function () { return __awaiter
                 return [4 /*yield*/, sdk.api.chats.createOne({ roomId: room.id, senderId: e1.id, message: 'cancel' })];
             case 11:
                 _e.sent();
-                return [4 /*yield*/, wait(undefined, 100)];
-            case 12:
-                _e.sent();
-                console.log(jRemove.id, removeStep2.id, e1.id);
-                return [4 /*yield*/, async_test("Appropriate Automated Actions are cancelled on incoming message", function () { return sdk.api.automated_actions.getSome(); }, { onResult: function (actions) { return (!!actions.find(function (a) {
+                return [4 /*yield*/, async_test("Appropriate Automated Actions are cancelled on incoming message", function () { return pollForResults(sdk.api.automated_actions.getSome, function (actions) { return (!!actions.find(function (a) {
+                        return a.journeyId === jRemove.id
+                            && a.automationStepId === removeStep1.id
+                            && a.enduserId === e1.id
+                            && a.status === 'cancelled';
+                    })
+                        && !!actions.find(function (a) {
                             return a.journeyId === jRemove.id
                                 && a.automationStepId === removeStep1.id
+                                && a.enduserId === e2.id
+                                && a.status === 'active';
+                        })
+                        && !!actions.find(function (a) {
+                            return a.journeyId === jDontRemove.id
+                                && a.automationStepId === dontRemoveStep1.id
                                 && a.enduserId === e1.id
-                                && a.status === 'cancelled';
+                                && a.status === 'active';
                         })
-                            && !!actions.find(function (a) {
-                                return a.journeyId === jRemove.id
-                                    && a.automationStepId === removeStep1.id
-                                    && a.enduserId === e2.id
-                                    && a.status === 'active';
-                            })
-                            && !!actions.find(function (a) {
-                                return a.journeyId === jDontRemove.id
-                                    && a.automationStepId === dontRemoveStep1.id
-                                    && a.enduserId === e1.id
-                                    && a.status === 'active';
-                            })
-                            && !!actions.find(function (a) {
-                                return a.journeyId === jDontRemove.id
-                                    && a.automationStepId === dontRemoveStep1.id
-                                    && a.enduserId === e2.id
-                                    && a.status === 'active';
-                            })); } })];
-            case 13:
+                        && !!actions.find(function (a) {
+                            return a.journeyId === jDontRemove.id
+                                && a.automationStepId === dontRemoveStep1.id
+                                && a.enduserId === e2.id
+                                && a.status === 'active';
+                        })); }, 25, 20); }, passOnAnyResult)];
+            case 12:
                 _e.sent();
                 return [4 /*yield*/, sdk.api.journeys.handle_incoming_communication({ enduserId: e2.id })];
-            case 14:
+            case 13:
                 _e.sent();
                 return [4 /*yield*/, wait(undefined, 250)];
-            case 15:
+            case 14:
                 _e.sent();
                 return [4 /*yield*/, async_test("handle_incoming_communication test for other enduser", function () { return sdk.api.automated_actions.getSome(); }, { onResult: function (actions) { return (!!actions.find(function (a) {
                             return a.journeyId === jRemove.id
@@ -5730,7 +5715,7 @@ var remove_from_journey_on_incoming_comms_tests = function () { return __awaiter
                                 && a.enduserId === e2.id
                                 && a.status === 'cancelled';
                         })); } })];
-            case 16:
+            case 15:
                 _e.sent();
                 return [4 /*yield*/, Promise.all([
                         sdk.api.endusers.deleteOne(e1.id),
@@ -5739,7 +5724,7 @@ var remove_from_journey_on_incoming_comms_tests = function () { return __awaiter
                         sdk.api.journeys.deleteOne(jDontRemove.id),
                         sdk.api.chat_rooms.deleteOne(room.id),
                     ])];
-            case 17:
+            case 16:
                 _e.sent();
                 return [2 /*return*/];
         }
@@ -5749,9 +5734,11 @@ var pdf_generation = function () { return __awaiter(void 0, void 0, void 0, func
     var e, responses, i, fr;
     return __generator(this, function (_a) {
         switch (_a.label) {
-            case 0: return [4 /*yield*/, sdk.api.endusers.createOne({ fname: 'test' })
-                // include lots of answers to ensure PDF height doesn't produce any cut-off
-            ];
+            case 0:
+                log_header("pdf_generation Tests");
+                return [4 /*yield*/, sdk.api.endusers.createOne({ fname: 'test' })
+                    // include lots of answers to ensure PDF height doesn't produce any cut-off
+                ];
             case 1:
                 e = _a.sent();
                 responses = [];
@@ -5780,7 +5767,6 @@ var pdf_generation = function () { return __awaiter(void 0, void 0, void 0, func
                     .then(function (d) { return (fs.writeFileSync('test_generated.pdf', d.data)); });
                 return [4 /*yield*/, Promise.all([
                         sdk.api.endusers.deleteOne(e.id),
-                        sdk.api.form_responses.deleteOne(fr.id),
                     ])];
             case 3:
                 _a.sent();
@@ -6007,10 +5993,11 @@ var pollForResults = function (f, evaluate, intervalInMS, iterations) {
     if (intervalInMS === void 0) { intervalInMS = 500; }
     if (iterations === void 0) { iterations = 20; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var i, result;
+        var lastResult, i, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    lastResult = undefined;
                     i = 0;
                     _a.label = 1;
                 case 1:
@@ -6021,13 +6008,16 @@ var pollForResults = function (f, evaluate, intervalInMS, iterations) {
                     return [4 /*yield*/, f()];
                 case 3:
                     result = _a.sent();
+                    lastResult = result;
                     if (evaluate(result))
                         return [2 /*return*/, result];
                     _a.label = 4;
                 case 4:
                     i++;
                     return [3 /*break*/, 1];
-                case 5: throw new Error("failed pollForResults");
+                case 5:
+                    console.log(lastResult);
+                    throw new Error("failed pollForResults");
             }
         });
     });
@@ -6486,6 +6476,80 @@ var field_equals_trigger_tests = function () { return __awaiter(void 0, void 0,
         }
     });
 }); };
+export var no_chained_triggers_tests = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var t1, t2, enduser;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                log_header("No Chained Triggers Tests");
+                return [4 /*yield*/, sdk.api.automation_triggers.createOne({
+                        title: 't1', status: 'Active',
+                        event: {
+                            type: 'Field Equals',
+                            info: {
+                                field: 'fname',
+                                value: 'Trigger'
+                            },
+                        },
+                        action: {
+                            type: 'Add Tags',
+                            info: { tags: ['t1'] }
+                        }
+                    })];
+            case 1:
+                t1 = _a.sent();
+                return [4 /*yield*/, sdk.api.automation_triggers.createOne({
+                        title: 't2', status: 'Active',
+                        event: {
+                            type: 'Field Equals',
+                            info: {
+                                field: 'fname',
+                                value: '$exists'
+                            },
+                        },
+                        action: {
+                            type: 'Add Tags',
+                            info: { tags: ['t2'] }
+                        },
+                        enduserCondition: { $and: [{ condition: { tags: 't1' } }] },
+                    })
+                    // should only trigger t1, t1 would trigger t2 if allowed, but should not
+                ];
+            case 2:
+                t2 = _a.sent();
+                return [4 /*yield*/, sdk.api.endusers.createOne({ fname: 'Trigger' })];
+            case 3:
+                enduser = _a.sent();
+                return [4 /*yield*/, wait(undefined, 250)];
+            case 4:
+                _a.sent();
+                return [4 /*yield*/, async_test("Trigger not activated by other trigger update", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a, _b; return !!(!((_a = e.tags) === null || _a === void 0 ? void 0 : _a.includes('t2')) && ((_b = e.tags) === null || _b === void 0 ? void 0 : _b.includes('t1'))); } })
+                    // should cover both triggers now, which results in adding only the second tag
+                ];
+            case 5:
+                _a.sent();
+                // should cover both triggers now, which results in adding only the second tag
+                return [4 /*yield*/, sdk.api.endusers.updateOne(enduser.id, { fname: "Updated" })];
+            case 6:
+                // should cover both triggers now, which results in adding only the second tag
+                _a.sent();
+                return [4 /*yield*/, wait(undefined, 250)];
+            case 7:
+                _a.sent();
+                return [4 /*yield*/, async_test("Trigger activated directly", function () { return sdk.api.endusers.getOne(enduser.id); }, { onResult: function (e) { var _a; return !!(((_a = e.tags) === null || _a === void 0 ? void 0 : _a.includes('t1')) && e.tags.includes('t2')); } })];
+            case 8:
+                _a.sent();
+                return [4 /*yield*/, Promise.all([
+                        sdk.api.automation_triggers.deleteOne(t1.id),
+                        sdk.api.automation_triggers.deleteOne(t2.id),
+                        sdk.api.endusers.deleteOne(enduser.id)
+                    ])];
+            case 9:
+                _a.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
 var NO_TEST = function () { };
 var tests = {
     phone_trees: NO_TEST,
@@ -6590,7 +6654,7 @@ var validate_schema = function () {
                 _k.sent();
                 _k.label = 2;
             case 2:
-                _k.trys.push([2, 36, , 37]);
+                _k.trys.push([2, 37, , 38]);
                 return [4 /*yield*/, validate_schema()];
             case 3:
                 _k.sent();
@@ -6624,86 +6688,89 @@ var validate_schema = function () {
                 return [4 /*yield*/, multi_tenant_tests()]; // should come right after setup tests
             case 9:
                 _k.sent(); // should come right after setup tests
-                return [4 /*yield*/, field_equals_trigger_tests()];
+                return [4 /*yield*/, no_chained_triggers_tests()];
             case 10:
                 _k.sent();
-                return [4 /*yield*/, test_ticket_automation_assignment_and_optimization()];
+                return [4 /*yield*/, field_equals_trigger_tests()];
             case 11:
                 _k.sent();
-                return [4 /*yield*/, role_based_access_tests()];
+                return [4 /*yield*/, test_ticket_automation_assignment_and_optimization()];
             case 12:
                 _k.sent();
-                return [4 /*yield*/, automation_trigger_tests()];
+                return [4 /*yield*/, role_based_access_tests()];
             case 13:
                 _k.sent();
-                return [4 /*yield*/, enduser_session_tests()];
+                return [4 /*yield*/, automation_trigger_tests()];
             case 14:
                 _k.sent();
-                return [4 /*yield*/, nextReminderInMS_tests()];
+                return [4 /*yield*/, enduser_session_tests()];
             case 15:
                 _k.sent();
-                return [4 /*yield*/, search_tests()];
+                return [4 /*yield*/, nextReminderInMS_tests()];
             case 16:
                 _k.sent();
-                return [4 /*yield*/, wait_for_trigger_tests()];
+                return [4 /*yield*/, search_tests()];
             case 17:
                 _k.sent();
-                return [4 /*yield*/, pdf_generation()];
+                return [4 /*yield*/, wait_for_trigger_tests()];
             case 18:
                 _k.sent();
-                return [4 /*yield*/, remove_from_journey_on_incoming_comms_tests()];
+                return [4 /*yield*/, pdf_generation()];
             case 19:
                 _k.sent();
-                return [4 /*yield*/, rate_limit_tests()];
+                return [4 /*yield*/, remove_from_journey_on_incoming_comms_tests()];
             case 20:
                 _k.sent();
-                return [4 /*yield*/, merge_enduser_tests()];
+                return [4 /*yield*/, rate_limit_tests()];
             case 21:
                 _k.sent();
-                return [4 /*yield*/, self_serve_appointment_booking_tests()];
+                return [4 /*yield*/, merge_enduser_tests()];
             case 22:
                 _k.sent();
-                return [4 /*yield*/, auto_reply_tests()];
+                return [4 /*yield*/, self_serve_appointment_booking_tests()];
             case 23:
                 _k.sent();
-                return [4 /*yield*/, sub_organization_enduser_tests()];
+                return [4 /*yield*/, auto_reply_tests()];
             case 24:
                 _k.sent();
-                return [4 /*yield*/, sub_organization_tests()];
+                return [4 /*yield*/, sub_organization_enduser_tests()];
             case 25:
                 _k.sent();
-                return [4 /*yield*/, filter_by_date_tests()];
+                return [4 /*yield*/, sub_organization_tests()];
             case 26:
                 _k.sent();
-                return [4 /*yield*/, generate_user_auth_tests()];
+                return [4 /*yield*/, filter_by_date_tests()];
             case 27:
                 _k.sent();
-                return [4 /*yield*/, generateEnduserAuthTests()];
+                return [4 /*yield*/, generate_user_auth_tests()];
             case 28:
                 _k.sent();
-                return [4 /*yield*/, public_form_tests()];
+                return [4 /*yield*/, generateEnduserAuthTests()];
             case 29:
                 _k.sent();
-                return [4 /*yield*/, badInputTests()];
+                return [4 /*yield*/, public_form_tests()];
             case 30:
                 _k.sent();
-                return [4 /*yield*/, filterTests()];
+                return [4 /*yield*/, badInputTests()];
             case 31:
                 _k.sent();
-                return [4 /*yield*/, updatesTests()];
+                return [4 /*yield*/, filterTests()];
             case 32:
                 _k.sent();
-                return [4 /*yield*/, threadKeyTests()];
+                return [4 /*yield*/, updatesTests()];
             case 33:
                 _k.sent();
-                return [4 /*yield*/, enduserAccessTests()];
+                return [4 /*yield*/, threadKeyTests()];
             case 34:
                 _k.sent();
-                return [4 /*yield*/, enduser_redaction_tests()];
+                return [4 /*yield*/, enduserAccessTests()];
             case 35:
                 _k.sent();
-                return [3 /*break*/, 37];
+                return [4 /*yield*/, enduser_redaction_tests()];
             case 36:
+                _k.sent();
+                return [3 /*break*/, 38];
+            case 37:
                 err_1 = _k.sent();
                 console.error("Failed during custom test");
                 if (err_1.message && err_1.info) {
@@ -6713,18 +6780,18 @@ var validate_schema = function () {
                     console.error(err_1);
                 }
                 process.exit(1);
-                return [3 /*break*/, 37];
-            case 37:
+                return [3 /*break*/, 38];
+            case 38:
                 _a = schema;
                 _b = [];
                 for (_c in _a)
                     _b.push(_c);
                 _i = 0;
-                _k.label = 38;
-            case 38:
-                if (!(_i < _b.length)) return [3 /*break*/, 41];
+                _k.label = 39;
+            case 39:
+                if (!(_i < _b.length)) return [3 /*break*/, 42];
                 _c = _b[_i];
-                if (!(_c in _a)) return [3 /*break*/, 40];
+                if (!(_c in _a)) return [3 /*break*/, 41];
                 n = _c;
                 returnValidation = (_j = (_h = schema[n].customActions) === null || _h === void 0 ? void 0 : _h.create) === null || _j === void 0 ? void 0 : _j.returns;
                 return [4 /*yield*/, run_generated_tests({
@@ -6735,41 +6802,41 @@ var validate_schema = function () {
                             create: returnValidation // ModelFields<ClientModel>,
                         }
                     })];
-            case 39:
-                _k.sent();
-                _k.label = 40;
             case 40:
-                _i++;
-                return [3 /*break*/, 38];
+                _k.sent();
+                _k.label = 41;
             case 41:
+                _i++;
+                return [3 /*break*/, 39];
+            case 42:
                 _d = tests;
                 _e = [];
                 for (_f in _d)
                     _e.push(_f);
                 _g = 0;
-                _k.label = 42;
-            case 42:
-                if (!(_g < _e.length)) return [3 /*break*/, 47];
-                _f = _e[_g];
-                if (!(_f in _d)) return [3 /*break*/, 46];
-                t = _f;
                 _k.label = 43;
             case 43:
-                _k.trys.push([43, 45, , 46]);
-                return [4 /*yield*/, tests[t]()];
+                if (!(_g < _e.length)) return [3 /*break*/, 48];
+                _f = _e[_g];
+                if (!(_f in _d)) return [3 /*break*/, 47];
+                t = _f;
+                _k.label = 44;
             case 44:
-                _k.sent();
-                return [3 /*break*/, 46];
+                _k.trys.push([44, 46, , 47]);
+                return [4 /*yield*/, tests[t]()];
             case 45:
+                _k.sent();
+                return [3 /*break*/, 47];
+            case 46:
                 err_2 = _k.sent();
                 console.error("Error running test:");
                 console.error(err_2);
                 process.exit(1);
-                return [3 /*break*/, 46];
-            case 46:
-                _g++;
-                return [3 /*break*/, 42];
+                return [3 /*break*/, 47];
             case 47:
+                _g++;
+                return [3 /*break*/, 43];
+            case 48:
                 process.exit();
                 return [2 /*return*/];
         }