diff --git a/__tests__/html/autoScroll.acknowledgement.js b/__tests__/html/autoScroll.acknowledgement.js deleted file mode 100644 index 0a08c6b97e..0000000000 --- a/__tests__/html/autoScroll.acknowledgement.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll acknowledgement logic', () => { - test('should acknowledge activities correctly', () => runHTML('autoScroll.acknowledgement.html')); -}); diff --git a/__tests__/html/autoScroll.afterSend.js b/__tests__/html/autoScroll.afterSend.js deleted file mode 100644 index fed99f3451..0000000000 --- a/__tests__/html/autoScroll.afterSend.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll', () => { - test('should scroll to bottom on send', () => runHTML('autoScroll.afterSend.html')); -}); diff --git a/__tests__/html/autoScroll.eventActivity.js b/__tests__/html/autoScroll.eventActivity.js deleted file mode 100644 index 6fc87aa26f..0000000000 --- a/__tests__/html/autoScroll.eventActivity.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with "activity" snap behavior', () => { - test('should not pause on invisible activity', () => runHTML('autoScroll.eventActivity.html')); -}); diff --git a/__tests__/html/autoScroll.snap.activity.js b/__tests__/html/autoScroll.snap.activity.js deleted file mode 100644 index a3333be8ea..0000000000 --- a/__tests__/html/autoScroll.snap.activity.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with "activity" snap behavior', () => { - test('should scroll correctly', () => runHTML('autoScroll.snap.activity.html')); -}); diff --git a/__tests__/html/autoScroll.snap.activityAndPage.js b/__tests__/html/autoScroll.snap.activityAndPage.js deleted file mode 100644 index 80078569fb..0000000000 --- a/__tests__/html/autoScroll.snap.activityAndPage.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with "activity" and "page" snap behavior', () => { - test('should scroll correctly', () => runHTML('autoScroll.snap.activityAndPage.html')); -}); diff --git a/__tests__/html/autoScroll.snap.default.js b/__tests__/html/autoScroll.snap.default.js deleted file mode 100644 index 1f749d14e0..0000000000 --- a/__tests__/html/autoScroll.snap.default.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with "default" snap behavior', () => { - test('should scroll correctly', () => runHTML('autoScroll.snap.default.html')); -}); diff --git a/__tests__/html/autoScroll.snap.page.js b/__tests__/html/autoScroll.snap.page.js deleted file mode 100644 index 3bb9ec5051..0000000000 --- a/__tests__/html/autoScroll.snap.page.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with "page" snap behavior', () => { - test('should scroll correctly', () => runHTML('autoScroll.snap.page.html')); -}); diff --git a/__tests__/html/autoScroll.withPostBack.activity.js b/__tests__/html/autoScroll.withPostBack.activity.js deleted file mode 100644 index cfab52f62f..0000000000 --- a/__tests__/html/autoScroll.withPostBack.activity.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with "activity" snap behavior', () => { - test('should not pause on post back activity', () => runHTML('autoScroll.withPostBack.activity.html')); -}); diff --git a/__tests__/html/autoScroll.withPostBack.page.js b/__tests__/html/autoScroll.withPostBack.page.js deleted file mode 100644 index e101d4b068..0000000000 --- a/__tests__/html/autoScroll.withPostBack.page.js +++ /dev/null @@ -1,5 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with "page" snap behavior', () => { - test('should not pause on post back activity', () => runHTML('autoScroll.withPostBack.page.html')); -}); diff --git a/__tests__/html/autoScroll.withSuggestedActions.submitAdaptiveCards.js b/__tests__/html/autoScroll.withSuggestedActions.submitAdaptiveCards.js deleted file mode 100644 index 01905fae3c..0000000000 --- a/__tests__/html/autoScroll.withSuggestedActions.submitAdaptiveCards.js +++ /dev/null @@ -1,6 +0,0 @@ -/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */ - -describe('Auto-scroll with suggested actions shown', () => { - test('should stick to bottom if submitting an Adaptive Card', () => - runHTML('autoScroll.withSuggestedActions.submitAdaptiveCards.html')); -}); diff --git a/__tests__/html/autoScroll.acknowledgement.html b/__tests__/html2/autoScroll/autoScroll.acknowledgement.html similarity index 100% rename from __tests__/html/autoScroll.acknowledgement.html rename to __tests__/html2/autoScroll/autoScroll.acknowledgement.html diff --git a/__tests__/html/autoScroll.afterSend.html b/__tests__/html2/autoScroll/autoScroll.afterSend.html similarity index 97% rename from __tests__/html/autoScroll.afterSend.html rename to __tests__/html2/autoScroll/autoScroll.afterSend.html index 6aafa914a5..ee54cc491d 100644 --- a/__tests__/html/autoScroll.afterSend.html +++ b/__tests__/html2/autoScroll/autoScroll.afterSend.html @@ -36,7 +36,7 @@ // THEN: It should scroll to bottom after send. await pageConditions.scrollToBottomCompleted(); await pageConditions.minNumActivitiesShown(4); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-after-send-js-auto-scroll-should-scroll-to-bottom-on-send-1-snap.png b/__tests__/html2/autoScroll/autoScroll.afterSend.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-after-send-js-auto-scroll-should-scroll-to-bottom-on-send-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.afterSend.html.snap-1.png diff --git a/__tests__/html/autoScroll.eventActivity.html b/__tests__/html2/autoScroll/autoScroll.eventActivity.html similarity index 99% rename from __tests__/html/autoScroll.eventActivity.html rename to __tests__/html2/autoScroll/autoScroll.eventActivity.html index ec23808bea..112b4a9cda 100644 --- a/__tests__/html/autoScroll.eventActivity.html +++ b/__tests__/html2/autoScroll/autoScroll.eventActivity.html @@ -108,7 +108,7 @@ // EXPECT: Transcript should not scroll further than the "Minim voluptate" activity. await pageConditions.scrollStabilized(scrollTop); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-event-activity-js-auto-scroll-with-activity-snap-behavior-should-not-pause-on-invisible-activity-1-snap.png b/__tests__/html2/autoScroll/autoScroll.eventActivity.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-event-activity-js-auto-scroll-with-activity-snap-behavior-should-not-pause-on-invisible-activity-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.eventActivity.html.snap-1.png diff --git a/__tests__/html/autoScroll.snap.activity.html b/__tests__/html2/autoScroll/autoScroll.snap.activity.html similarity index 98% rename from __tests__/html/autoScroll.snap.activity.html rename to __tests__/html2/autoScroll/autoScroll.snap.activity.html index 060a11ddc5..440f4a838d 100644 --- a/__tests__/html/autoScroll.snap.activity.html +++ b/__tests__/html2/autoScroll/autoScroll.snap.activity.html @@ -105,7 +105,7 @@ 'scrollable should be at 2 activities + 100px' ); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-snap-activity-js-auto-scroll-with-activity-snap-behavior-should-scroll-correctly-1-snap.png b/__tests__/html2/autoScroll/autoScroll.snap.activity.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-snap-activity-js-auto-scroll-with-activity-snap-behavior-should-scroll-correctly-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.snap.activity.html.snap-1.png diff --git a/__tests__/html/autoScroll.snap.activityAndPage.html b/__tests__/html2/autoScroll/autoScroll.snap.activityAndPage.html similarity index 99% rename from __tests__/html/autoScroll.snap.activityAndPage.html rename to __tests__/html2/autoScroll/autoScroll.snap.activityAndPage.html index a93f409a91..ad39e745ee 100644 --- a/__tests__/html/autoScroll.snap.activityAndPage.html +++ b/__tests__/html2/autoScroll/autoScroll.snap.activityAndPage.html @@ -116,7 +116,7 @@ expect(scrollable.scrollTop).toBe(top - 100); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-snap-activity-and-page-js-auto-scroll-with-activity-and-page-snap-behavior-should-scroll-correctly-1-snap.png b/__tests__/html2/autoScroll/autoScroll.snap.activityAndPage.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-snap-activity-and-page-js-auto-scroll-with-activity-and-page-snap-behavior-should-scroll-correctly-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.snap.activityAndPage.html.snap-1.png diff --git a/__tests__/html/autoScroll.snap.default.html b/__tests__/html2/autoScroll/autoScroll.snap.default.html similarity index 98% rename from __tests__/html/autoScroll.snap.default.html rename to __tests__/html2/autoScroll/autoScroll.snap.default.html index cea4e715ab..784d6b3e10 100644 --- a/__tests__/html/autoScroll.snap.default.html +++ b/__tests__/html2/autoScroll/autoScroll.snap.default.html @@ -94,7 +94,7 @@ 'scrollable should be at bottom' ); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-snap-default-js-auto-scroll-with-default-snap-behavior-should-scroll-correctly-1-snap.png b/__tests__/html2/autoScroll/autoScroll.snap.default.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-snap-default-js-auto-scroll-with-default-snap-behavior-should-scroll-correctly-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.snap.default.html.snap-1.png diff --git a/__tests__/html/autoScroll.snap.page.html b/__tests__/html2/autoScroll/autoScroll.snap.page.html similarity index 98% rename from __tests__/html/autoScroll.snap.page.html rename to __tests__/html2/autoScroll/autoScroll.snap.page.html index b9e8fea2dd..a70322b235 100644 --- a/__tests__/html/autoScroll.snap.page.html +++ b/__tests__/html2/autoScroll/autoScroll.snap.page.html @@ -94,7 +94,7 @@ ~~(activityElementAtTopOfViewOffsetTop - scrollable.offsetHeight * 0.8) ); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-snap-page-js-auto-scroll-with-page-snap-behavior-should-scroll-correctly-1-snap.png b/__tests__/html2/autoScroll/autoScroll.snap.page.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-snap-page-js-auto-scroll-with-page-snap-behavior-should-scroll-correctly-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.snap.page.html.snap-1.png diff --git a/__tests__/html/autoScroll.withPostBack.activity.html b/__tests__/html2/autoScroll/autoScroll.withPostBack.activity.html similarity index 99% rename from __tests__/html/autoScroll.withPostBack.activity.html rename to __tests__/html2/autoScroll/autoScroll.withPostBack.activity.html index b19d5a1ec0..c2441399e6 100644 --- a/__tests__/html/autoScroll.withPostBack.activity.html +++ b/__tests__/html2/autoScroll/autoScroll.withPostBack.activity.html @@ -168,7 +168,7 @@ // EXPECT: Transcript already reached snap point (1 activity), it should not scroll further below. await pageConditions.scrollStabilized(scrollTop); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-with-post-back-activity-js-auto-scroll-with-activity-snap-behavior-should-not-pause-on-post-back-activity-1-snap.png b/__tests__/html2/autoScroll/autoScroll.withPostBack.activity.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-with-post-back-activity-js-auto-scroll-with-activity-snap-behavior-should-not-pause-on-post-back-activity-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.withPostBack.activity.html.snap-1.png diff --git a/__tests__/html/autoScroll.withPostBack.page.html b/__tests__/html2/autoScroll/autoScroll.withPostBack.page.html similarity index 99% rename from __tests__/html/autoScroll.withPostBack.page.html rename to __tests__/html2/autoScroll/autoScroll.withPostBack.page.html index 4abbacac6c..44aeddb69f 100644 --- a/__tests__/html/autoScroll.withPostBack.page.html +++ b/__tests__/html2/autoScroll/autoScroll.withPostBack.page.html @@ -165,7 +165,7 @@ // EXPECT: Pause scrolling when the "Minim voluptate" activity (index = 6) is at the top of the screen. await pageConditions.scrollStabilized(pageObjects.getActivityBoundingBoxes()[6].top); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-with-post-back-page-js-auto-scroll-with-page-snap-behavior-should-not-pause-on-post-back-activity-1-snap.png b/__tests__/html2/autoScroll/autoScroll.withPostBack.page.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-with-post-back-page-js-auto-scroll-with-page-snap-behavior-should-not-pause-on-post-back-activity-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.withPostBack.page.html.snap-1.png diff --git a/__tests__/html/autoScroll.withSuggestedActions.submitAdaptiveCards.html b/__tests__/html2/autoScroll/autoScroll.withSuggestedActions.submitAdaptiveCards.html similarity index 97% rename from __tests__/html/autoScroll.withSuggestedActions.submitAdaptiveCards.html rename to __tests__/html2/autoScroll/autoScroll.withSuggestedActions.submitAdaptiveCards.html index 6c2af7c908..2f1f4dc881 100644 --- a/__tests__/html/autoScroll.withSuggestedActions.submitAdaptiveCards.html +++ b/__tests__/html2/autoScroll/autoScroll.withSuggestedActions.submitAdaptiveCards.html @@ -40,7 +40,7 @@ // THEN: It should stick to the bottom. await pageConditions.scrollToBottomCompleted(); - await host.snapshot(); + await host.snapshot('local'); }); diff --git a/__tests__/__image_snapshots__/html/auto-scroll-with-suggested-actions-submit-adaptive-cards-js-auto-scroll-with-suggested-actions-shown-should-stick-to-bottom-if-submitting-an-adaptive-card-1-snap.png b/__tests__/html2/autoScroll/autoScroll.withSuggestedActions.submitAdaptiveCards.html.snap-1.png similarity index 100% rename from __tests__/__image_snapshots__/html/auto-scroll-with-suggested-actions-submit-adaptive-cards-js-auto-scroll-with-suggested-actions-shown-should-stick-to-bottom-if-submitting-an-adaptive-card-1-snap.png rename to __tests__/html2/autoScroll/autoScroll.withSuggestedActions.submitAdaptiveCards.html.snap-1.png