diff --git a/__tests__/html/activity.unknownActivity.js b/__tests__/html/activity.unknownActivity.js deleted file mode 100644 index 82bdbf0d31..0000000000 --- a/__tests__/html/activity.unknownActivity.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity', () => { - test('should not show unknown activity', () => runHTML('activity.unknownActivity.html')); -}); diff --git a/__tests__/html/activity.unknownAttachment.js b/__tests__/html/activity.unknownAttachment.js deleted file mode 100644 index 6b13c46413..0000000000 --- a/__tests__/html/activity.unknownAttachment.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity', () => { - test('should not show unknown attachment', () => runHTML('activity.unknownAttachment.html')); -}); diff --git a/__tests__/html/activityGrouping.avatarMiddleware.atBottom.js b/__tests__/html/activityGrouping.avatarMiddleware.atBottom.js deleted file mode 100644 index b17a54a82c..0000000000 --- a/__tests__/html/activityGrouping.avatarMiddleware.atBottom.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity grouping', () => { - test('should not break avatar middleware with avatar at bottom', () => - runHTML('activityGrouping.avatarMiddleware.atBottom.html')); -}); diff --git a/__tests__/html/activityGrouping.avatarMiddleware.js b/__tests__/html/activityGrouping.avatarMiddleware.js deleted file mode 100644 index 106c379a59..0000000000 --- a/__tests__/html/activityGrouping.avatarMiddleware.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity grouping', () => { - test('should not break avatar middleware', () => runHTML('activityGrouping.avatarMiddleware.html')); -}); diff --git a/__tests__/html/activityGrouping.customMiddleware.js b/__tests__/html/activityGrouping.customMiddleware.js deleted file mode 100644 index d24fc09f9d..0000000000 --- a/__tests__/html/activityGrouping.customMiddleware.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity grouping', () => { - test('should accept valid or invalid custom middleware', () => runHTML('activityGrouping.customMiddleware.html')); -}); diff --git a/__tests__/html/activityGrouping.disableTimestamp.js b/__tests__/html/activityGrouping.disableTimestamp.js deleted file mode 100644 index 0d50a343c0..0000000000 --- a/__tests__/html/activityGrouping.disableTimestamp.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity grouping', () => { - test('should show timestamp even if timestamp is disabled', () => - runHTML('activityGrouping.disableTimestamp.html')); -}); diff --git a/__tests__/html/activityGrouping.groupingActivityStatus.js b/__tests__/html/activityGrouping.groupingActivityStatus.js deleted file mode 100644 index 056e4b56d4..0000000000 --- a/__tests__/html/activityGrouping.groupingActivityStatus.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity grouping', () => { - test('should group activity status after activities being sent', () => - runHTML('activityGrouping.groupingActivityStatus.html')); -}); diff --git a/__tests__/html/activityGrouping.legacyActivityMiddleware.js b/__tests__/html/activityGrouping.legacyActivityMiddleware.js deleted file mode 100644 index 3a1071abfb..0000000000 --- a/__tests__/html/activityGrouping.legacyActivityMiddleware.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity grouping', () => { - test('should not break legacy activity middleware', () => runHTML('activityGrouping.legacyActivityMiddleware.html')); -}); diff --git a/__tests__/html/activityGrouping.legacyActivityStatusMiddleware.js b/__tests__/html/activityGrouping.legacyActivityStatusMiddleware.js deleted file mode 100644 index 886d1eb37a..0000000000 --- a/__tests__/html/activityGrouping.legacyActivityStatusMiddleware.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity grouping', () => { - test('should not break legacy activity status middleware', () => - runHTML('activityGrouping.legacyActivityStatusMiddleware.html')); -}); diff --git a/__tests__/html/activityStatus.sendFailed.noEchoBack.js b/__tests__/html/activityStatus.sendFailed.noEchoBack.js deleted file mode 100644 index 44dfeb741c..0000000000 --- a/__tests__/html/activityStatus.sendFailed.noEchoBack.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity status', () => { - test('should show "Send failed" when no echo back is received', () => - runHTML('activityStatus.sendFailed.noEchoBack.html')); -}); diff --git a/__tests__/html/activityStatus.sendFailed.postActivity.error.js b/__tests__/html/activityStatus.sendFailed.postActivity.error.js deleted file mode 100644 index be46e5a2e4..0000000000 --- a/__tests__/html/activityStatus.sendFailed.postActivity.error.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity status', () => { - test('should show "Send failed" when postActivity returned an error', () => - runHTML('activityStatus.sendFailed.postActivity.error.html')); -}); diff --git a/__tests__/html/activityStatus.sendFailed.postActivity.noReturnValue.js b/__tests__/html/activityStatus.sendFailed.postActivity.noReturnValue.js deleted file mode 100644 index 87a4ac10a5..0000000000 --- a/__tests__/html/activityStatus.sendFailed.postActivity.noReturnValue.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity status', () => { - test('should show "Send failed" when postActivity did not return any values', () => - runHTML('activityStatus.sendFailed.postActivity.noReturnValue.html')); -}); diff --git a/__tests__/html/activityStatus.sent.echoBack.after.postActivity.js b/__tests__/html/activityStatus.sent.echoBack.after.postActivity.js deleted file mode 100644 index d09247cab6..0000000000 --- a/__tests__/html/activityStatus.sent.echoBack.after.postActivity.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity status', () => { - test('should show "Sending" then "Just now" when echo back is received after return of postActivity() call', () => - runHTML('activityStatus.sent.echoBack.after.postActivity.html')); -}); diff --git a/__tests__/html/activityStatus.sent.echoBack.before.postActivity.js b/__tests__/html/activityStatus.sent.echoBack.before.postActivity.js deleted file mode 100644 index 5fc7602374..0000000000 --- a/__tests__/html/activityStatus.sent.echoBack.before.postActivity.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('activity status', () => { - test('should show "Sending" then "Just now" when echo back is received before return of postActivity() call', () => - runHTML('activityStatus.sent.echoBack.before.postActivity.html')); -}); diff --git a/__tests__/html/activityStatusTelemetry.ignoreStatusChange.incomingActivity.js b/__tests__/html/activityStatusTelemetry.ignoreStatusChange.incomingActivity.js deleted file mode 100644 index 45852d9685..0000000000 --- a/__tests__/html/activityStatusTelemetry.ignoreStatusChange.incomingActivity.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('ActivityStatusTelemetry', () => { - test('activity status telemetry should not be logged when incoming activity received', () => - runHTML('activityStatusTelemetry.ignoreStatusChange.incomingActivity.html')); -}); diff --git a/__tests__/html/activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.js b/__tests__/html/activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.js deleted file mode 100644 index d99b4c3760..0000000000 --- a/__tests__/html/activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.js +++ /dev/null @@ -1,4 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -test('text url attachment sent from bot should trigger status change telemetry event', () => runHTML('activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.html') -); diff --git a/__tests__/html/activityStatusTelemetry.sendingToSendFailed.js b/__tests__/html/activityStatusTelemetry.sendingToSendFailed.js deleted file mode 100644 index e17c27c967..0000000000 --- a/__tests__/html/activityStatusTelemetry.sendingToSendFailed.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('ActivityStatusTelemetry', () => { - test('activity status telemetry logged when activity status changed from "sending" to "send failed"', () => - runHTML('activityStatusTelemetry.sendingToSendFailed.html')); -}); diff --git a/__tests__/html/activityStatusTelemetry.sendingToSendFailedToSent.js b/__tests__/html/activityStatusTelemetry.sendingToSendFailedToSent.js deleted file mode 100644 index 021b06b47f..0000000000 --- a/__tests__/html/activityStatusTelemetry.sendingToSendFailedToSent.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('ActivityStatusTelemetry', () => { - test('activity status telemetry logged when activity status changed from "sending" to "send failed" to "sent"', () => - runHTML('activityStatusTelemetry.sendingToSendFailedToSent.html')); -}); diff --git a/__tests__/html/activityStatusTelemetry.sendingToSent.js b/__tests__/html/activityStatusTelemetry.sendingToSent.js deleted file mode 100644 index 6985040614..0000000000 --- a/__tests__/html/activityStatusTelemetry.sendingToSent.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('ActivityStatusTelemetry', () => { - test('activity status telemetry logged when activity status changed from "sending" to "sent"', () => - runHTML('activityStatusTelemetry.sendingToSent.html')); -}); diff --git a/__tests__/html/activity.unknownActivity.html b/__tests__/html2/activity/legacy/unknownActivity.html similarity index 87% rename from __tests__/html/activity.unknownActivity.html rename to __tests__/html2/activity/legacy/unknownActivity.html index e6a316fd1f..2379663295 100644 --- a/__tests__/html/activity.unknownActivity.html +++ b/__tests__/html2/activity/legacy/unknownActivity.html @@ -23,7 +23,8 @@ await pageObjects.sendMessageViaSendBox('unknown activity'); await pageConditions.minNumActivitiesShown(1); - await host.snapshot(); + // This snapshot differs with NODE_ENV, we need to make it pass in NODE_ENV !== 'production' + await host.snapshot('local'); }, { ignoreErrors: true } ); diff --git a/__tests__/__image_snapshots__/html/activity-unknown-activity-js-activity-should-not-show-unknown-activity-1-snap.png b/__tests__/html2/activity/legacy/unknownActivity.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-unknown-activity-js-activity-should-not-show-unknown-activity-1-snap.png rename to __tests__/html2/activity/legacy/unknownActivity.html.snap-1.png diff --git a/__tests__/html/activity.unknownAttachment.html b/__tests__/html2/activity/legacy/unknownAttachment.html similarity index 85% rename from __tests__/html/activity.unknownAttachment.html rename to __tests__/html2/activity/legacy/unknownAttachment.html index c3eb13457b..0951873f6f 100644 --- a/__tests__/html/activity.unknownAttachment.html +++ b/__tests__/html2/activity/legacy/unknownAttachment.html @@ -1,4 +1,4 @@ - + @@ -23,7 +23,8 @@ await pageObjects.sendMessageViaSendBox('unknown attachment'); await pageConditions.minNumActivitiesShown(2); - await host.snapshot(); + // This snapshot differs with NODE_ENV, we need to make it pass in NODE_ENV !== 'production' + await host.snapshot('local'); }, { ignoreErrors: true } ); diff --git a/__tests__/__image_snapshots__/html/activity-unknown-attachment-js-activity-should-not-show-unknown-attachment-1-snap.png b/__tests__/html2/activity/legacy/unknownAttachment.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-unknown-attachment-js-activity-should-not-show-unknown-attachment-1-snap.png rename to __tests__/html2/activity/legacy/unknownAttachment.html.snap-1.png diff --git a/__tests__/html/activityGrouping.avatarMiddleware.atBottom.html b/__tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.atBottom.html similarity index 99% rename from __tests__/html/activityGrouping.avatarMiddleware.atBottom.html rename to __tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.atBottom.html index 59ec4e2343..a6ae3d734e 100644 --- a/__tests__/html/activityGrouping.avatarMiddleware.atBottom.html +++ b/__tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.atBottom.html @@ -146,7 +146,7 @@ await pageConditions.uiConnected(); await pageConditions.allImagesLoaded(); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/activity-grouping-avatar-middleware-at-bottom-js-activity-grouping-should-not-break-avatar-middleware-with-avatar-at-bottom-1-snap.png b/__tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.atBottom.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-avatar-middleware-at-bottom-js-activity-grouping-should-not-break-avatar-middleware-with-avatar-at-bottom-1-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.atBottom.html.snap-1.png diff --git a/__tests__/html/activityGrouping.avatarMiddleware.html b/__tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.html similarity index 99% rename from __tests__/html/activityGrouping.avatarMiddleware.html rename to __tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.html index 88d8f67c3d..25a143ce07 100644 --- a/__tests__/html/activityGrouping.avatarMiddleware.html +++ b/__tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.html @@ -212,7 +212,7 @@ await pageConditions.uiConnected(); await pageConditions.allImagesLoaded(); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/activity-grouping-avatar-middleware-js-activity-grouping-should-not-break-avatar-middleware-1-snap.png b/__tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-avatar-middleware-js-activity-grouping-should-not-break-avatar-middleware-1-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.avatarMiddleware.html.snap-1.png diff --git a/__tests__/html/activityGrouping.customMiddleware.html b/__tests__/html2/activityGrouping/activityGrouping.customMiddleware.html similarity index 100% rename from __tests__/html/activityGrouping.customMiddleware.html rename to __tests__/html2/activityGrouping/activityGrouping.customMiddleware.html diff --git a/__tests__/html/activityGrouping.disableTimestamp.html b/__tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html similarity index 95% rename from __tests__/html/activityGrouping.disableTimestamp.html rename to __tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html index 7c5209d5cd..52c243490d 100644 --- a/__tests__/html/activityGrouping.disableTimestamp.html +++ b/__tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html @@ -70,16 +70,16 @@ await directLine.emulateIncomingActivity('Quis sit aliquip sit velit in velit magna culpa velit qui.'); - await host.snapshot(); + await host.snapshot('local'); clock.tick(29000); - await host.snapshot(); + await host.snapshot('local'); await resolveAll1(); await resolveAll2(); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/activity-grouping-disable-timestamp-js-activity-grouping-should-show-timestamp-even-if-timestamp-is-disabled-1-snap.png b/__tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-disable-timestamp-js-activity-grouping-should-show-timestamp-even-if-timestamp-is-disabled-1-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html.snap-1.png diff --git a/__tests__/__image_snapshots__/html/activity-grouping-disable-timestamp-js-activity-grouping-should-show-timestamp-even-if-timestamp-is-disabled-2-snap.png b/__tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html.snap-2.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-disable-timestamp-js-activity-grouping-should-show-timestamp-even-if-timestamp-is-disabled-2-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html.snap-2.png diff --git a/__tests__/__image_snapshots__/html/activity-grouping-disable-timestamp-js-activity-grouping-should-show-timestamp-even-if-timestamp-is-disabled-3-snap.png b/__tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html.snap-3.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-disable-timestamp-js-activity-grouping-should-show-timestamp-even-if-timestamp-is-disabled-3-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.disableTimestamp.html.snap-3.png diff --git a/__tests__/html/activityGrouping.groupingActivityStatus.html b/__tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html similarity index 96% rename from __tests__/html/activityGrouping.groupingActivityStatus.html rename to __tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html index 1890a51668..6f53c8ea52 100644 --- a/__tests__/html/activityGrouping.groupingActivityStatus.html +++ b/__tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html @@ -73,7 +73,7 @@ const sendMessage5 = await directLine.emulateOutgoingActivity('This activity is being sent.'); clock.tick(4000); - await host.snapshot(); + await host.snapshot('local'); clock.tick(1000); await sendMessage5.echoBack(activity => ({ @@ -81,7 +81,7 @@ text: 'Nostrud proident nisi dolore deserunt veniam labore labore mollit veniam.' })); sendMessage5.resolvePostActivity(); - await host.snapshot(); + await host.snapshot('local'); clock.tick(1000); await sendMessage2.echoBack(activity => ({ @@ -89,7 +89,7 @@ text: 'Excepteur culpa culpa ullamco consectetur et dolor excepteur cillum enim nostrud ex do.' })); sendMessage2.resolvePostActivity(); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/activity-grouping-grouping-activity-status-js-activity-grouping-should-group-activity-status-after-activities-being-sent-1-snap.png b/__tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-grouping-activity-status-js-activity-grouping-should-group-activity-status-after-activities-being-sent-1-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html.snap-1.png diff --git a/__tests__/__image_snapshots__/html/activity-grouping-grouping-activity-status-js-activity-grouping-should-group-activity-status-after-activities-being-sent-2-snap.png b/__tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html.snap-2.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-grouping-activity-status-js-activity-grouping-should-group-activity-status-after-activities-being-sent-2-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html.snap-2.png diff --git a/__tests__/__image_snapshots__/html/activity-grouping-grouping-activity-status-js-activity-grouping-should-group-activity-status-after-activities-being-sent-3-snap.png b/__tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html.snap-3.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-grouping-activity-status-js-activity-grouping-should-group-activity-status-after-activities-being-sent-3-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.groupingActivityStatus.html.snap-3.png diff --git a/__tests__/html/activityGrouping.legacyActivityMiddleware.html b/__tests__/html2/activityGrouping/activityGrouping.legacyActivityMiddleware.html similarity index 99% rename from __tests__/html/activityGrouping.legacyActivityMiddleware.html rename to __tests__/html2/activityGrouping/activityGrouping.legacyActivityMiddleware.html index 1112ca24a4..60b506fd2b 100644 --- a/__tests__/html/activityGrouping.legacyActivityMiddleware.html +++ b/__tests__/html2/activityGrouping/activityGrouping.legacyActivityMiddleware.html @@ -179,7 +179,7 @@ await pageConditions.scrollToBottomCompleted(); await pageConditions.allImagesLoaded(); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/activity-grouping-legacy-activity-middleware-js-activity-grouping-should-not-break-legacy-activity-middleware-1-snap.png b/__tests__/html2/activityGrouping/activityGrouping.legacyActivityMiddleware.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-legacy-activity-middleware-js-activity-grouping-should-not-break-legacy-activity-middleware-1-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.legacyActivityMiddleware.html.snap-1.png diff --git a/__tests__/html/activityGrouping.legacyActivityStatusMiddleware.html b/__tests__/html2/activityGrouping/activityGrouping.legacyActivityStatusMiddleware.html similarity index 97% rename from __tests__/html/activityGrouping.legacyActivityStatusMiddleware.html rename to __tests__/html2/activityGrouping/activityGrouping.legacyActivityStatusMiddleware.html index 57165021c7..757be8704e 100644 --- a/__tests__/html/activityGrouping.legacyActivityStatusMiddleware.html +++ b/__tests__/html2/activityGrouping/activityGrouping.legacyActivityStatusMiddleware.html @@ -100,11 +100,11 @@ 'This message should have status "Sending...", then turn to "Send failed".' ); - await host.snapshot(); + await host.snapshot('local'); clock.tick(20000); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/activity-grouping-legacy-activity-status-middleware-js-activity-grouping-should-not-break-legacy-activity-status-middleware-1-snap.png b/__tests__/html2/activityGrouping/activityGrouping.legacyActivityStatusMiddleware.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-legacy-activity-status-middleware-js-activity-grouping-should-not-break-legacy-activity-status-middleware-1-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.legacyActivityStatusMiddleware.html.snap-1.png diff --git a/__tests__/__image_snapshots__/html/activity-grouping-legacy-activity-status-middleware-js-activity-grouping-should-not-break-legacy-activity-status-middleware-2-snap.png b/__tests__/html2/activityGrouping/activityGrouping.legacyActivityStatusMiddleware.html.snap-2.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-grouping-legacy-activity-status-middleware-js-activity-grouping-should-not-break-legacy-activity-status-middleware-2-snap.png rename to __tests__/html2/activityGrouping/activityGrouping.legacyActivityStatusMiddleware.html.snap-2.png diff --git a/__tests__/html/activityStatus.sendFailed.noEchoBack.html b/__tests__/html2/activityStatus/activityStatus.sendFailed.noEchoBack.html similarity index 96% rename from __tests__/html/activityStatus.sendFailed.noEchoBack.html rename to __tests__/html2/activityStatus/activityStatus.sendFailed.noEchoBack.html index 1350a88afa..1ef6e45366 100644 --- a/__tests__/html/activityStatus.sendFailed.noEchoBack.html +++ b/__tests__/html2/activityStatus/activityStatus.sendFailed.noEchoBack.html @@ -80,6 +80,9 @@ // THEN: The message should have status of "Sending". await activityStatusInnerTextContained('Sending'); + // THEN: It should match snapshot. + await host.snapshot('local'); + // WHEN: After 20 seconds. clock.tick(20000); @@ -93,6 +96,9 @@ // This is because the message passed 20s as defined in `styleOptions.sendTimeout`. await activityStatusInnerTextContained('Send failed. Retry.'); + // THEN: It should match snapshot. + await host.snapshot('local'); + // WHEN: After 280 seconds (at t=5m). clock.tick(280000); diff --git a/__tests__/__image_snapshots__/html/activity-status-send-failed-no-echo-back-js-activity-status-should-show-send-failed-when-no-echo-back-is-received-1-snap.png b/__tests__/html2/activityStatus/activityStatus.sendFailed.noEchoBack.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-status-send-failed-no-echo-back-js-activity-status-should-show-send-failed-when-no-echo-back-is-received-1-snap.png rename to __tests__/html2/activityStatus/activityStatus.sendFailed.noEchoBack.html.snap-1.png diff --git a/__tests__/__image_snapshots__/html/activity-status-send-failed-no-echo-back-js-activity-status-should-show-send-failed-when-no-echo-back-is-received-2-snap.png b/__tests__/html2/activityStatus/activityStatus.sendFailed.noEchoBack.html.snap-2.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-status-send-failed-no-echo-back-js-activity-status-should-show-send-failed-when-no-echo-back-is-received-2-snap.png rename to __tests__/html2/activityStatus/activityStatus.sendFailed.noEchoBack.html.snap-2.png diff --git a/__tests__/html/activityStatus.sendFailed.postActivity.error.html b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.error.html similarity index 94% rename from __tests__/html/activityStatus.sendFailed.postActivity.error.html rename to __tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.error.html index f8ef8e3dd2..4f4725a7e0 100644 --- a/__tests__/html/activityStatus.sendFailed.postActivity.error.html +++ b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.error.html @@ -1,4 +1,4 @@ - + @@ -70,6 +70,9 @@ // THEN: The message should have status of "Sending". await activityStatusInnerTextContained('Sending'); + // THEN: It should match snapshot. + await host.snapshot('local'); + // WHEN: `postActivity` is rejected. sendMessage.rejectPostActivity(new Error('artificial error')); @@ -84,6 +87,9 @@ // THEN: The message should have status of "Send failed. Retry.". await activityStatusInnerTextContained('Send failed. Retry.'); + + // THEN: It should match snapshot. + await host.snapshot('local'); }, { ignoreErrors: true } ); diff --git a/__tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-error-js-activity-status-should-show-send-failed-when-post-activity-returned-an-error-1-snap.png b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.error.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-error-js-activity-status-should-show-send-failed-when-post-activity-returned-an-error-1-snap.png rename to __tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.error.html.snap-1.png diff --git a/__tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-error-js-activity-status-should-show-send-failed-when-post-activity-returned-an-error-2-snap.png b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.error.html.snap-2.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-error-js-activity-status-should-show-send-failed-when-post-activity-returned-an-error-2-snap.png rename to __tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.error.html.snap-2.png diff --git a/__tests__/html/activityStatus.sendFailed.postActivity.noReturnValue.html b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.noReturnValue.html similarity index 96% rename from __tests__/html/activityStatus.sendFailed.postActivity.noReturnValue.html rename to __tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.noReturnValue.html index 9df1d66dd9..096e435d0e 100644 --- a/__tests__/html/activityStatus.sendFailed.postActivity.noReturnValue.html +++ b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.noReturnValue.html @@ -89,6 +89,9 @@ // THEN: The message should have status of "Sending". await activityStatusInnerTextContained('Sending'); + // THEN: It should match snapshot. + await host.snapshot('local'); + // WHEN: After 20 seconds (at t=20s). clock.tick(20000); @@ -101,6 +104,9 @@ // THEN: The message should have status of "Send failed", based on `styleOptions.sendTimeout`. await activityStatusInnerTextContained('Send failed'); + // THEN: It should match snapshot. + await host.snapshot('local'); + // WHEN: After 280 seconds (at t=5m). clock.tick(280000); diff --git a/__tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-no-return-value-js-activity-status-should-show-send-failed-when-post-activity-did-not-return-any-values-1-snap.png b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.noReturnValue.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-no-return-value-js-activity-status-should-show-send-failed-when-post-activity-did-not-return-any-values-1-snap.png rename to __tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.noReturnValue.html.snap-1.png diff --git a/__tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-no-return-value-js-activity-status-should-show-send-failed-when-post-activity-did-not-return-any-values-2-snap.png b/__tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.noReturnValue.html.snap-2.png similarity index 100% rename from __tests__/__image_snapshots__/html/activity-status-send-failed-post-activity-no-return-value-js-activity-status-should-show-send-failed-when-post-activity-did-not-return-any-values-2-snap.png rename to __tests__/html2/activityStatus/activityStatus.sendFailed.postActivity.noReturnValue.html.snap-2.png diff --git a/__tests__/html/activityStatus.sent.echoBack.after.postActivity.html b/__tests__/html2/activityStatus/activityStatus.sent.echoBack.after.postActivity.html similarity index 100% rename from __tests__/html/activityStatus.sent.echoBack.after.postActivity.html rename to __tests__/html2/activityStatus/activityStatus.sent.echoBack.after.postActivity.html diff --git a/__tests__/html/activityStatus.sent.echoBack.before.postActivity.html b/__tests__/html2/activityStatus/activityStatus.sent.echoBack.before.postActivity.html similarity index 100% rename from __tests__/html/activityStatus.sent.echoBack.before.postActivity.html rename to __tests__/html2/activityStatus/activityStatus.sent.echoBack.before.postActivity.html diff --git a/__tests__/html/activityStatusTelemetry.ignoreStatusChange.incomingActivity.html b/__tests__/html2/activityStatus/activityStatusTelemetry.ignoreStatusChange.incomingActivity.html similarity index 100% rename from __tests__/html/activityStatusTelemetry.ignoreStatusChange.incomingActivity.html rename to __tests__/html2/activityStatus/activityStatusTelemetry.ignoreStatusChange.incomingActivity.html diff --git a/__tests__/html/activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.html b/__tests__/html2/activityStatus/activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.html similarity index 100% rename from __tests__/html/activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.html rename to __tests__/html2/activityStatus/activityStatusTelemetry.sendFiles.attachmentUrl.sendingToSent.html diff --git a/__tests__/html/activityStatusTelemetry.sendingToSendFailed.html b/__tests__/html2/activityStatus/activityStatusTelemetry.sendingToSendFailed.html similarity index 100% rename from __tests__/html/activityStatusTelemetry.sendingToSendFailed.html rename to __tests__/html2/activityStatus/activityStatusTelemetry.sendingToSendFailed.html diff --git a/__tests__/html/activityStatusTelemetry.sendingToSendFailedToSent.html b/__tests__/html2/activityStatus/activityStatusTelemetry.sendingToSendFailedToSent.html similarity index 100% rename from __tests__/html/activityStatusTelemetry.sendingToSendFailedToSent.html rename to __tests__/html2/activityStatus/activityStatusTelemetry.sendingToSendFailedToSent.html diff --git a/__tests__/html/activityStatusTelemetry.sendingToSent.html b/__tests__/html2/activityStatus/activityStatusTelemetry.sendingToSent.html similarity index 100% rename from __tests__/html/activityStatusTelemetry.sendingToSent.html rename to __tests__/html2/activityStatus/activityStatusTelemetry.sendingToSent.html