diff --git a/__tests__/html/carousel.flipperButton.js b/__tests__/html/carousel.flipperButton.js
deleted file mode 100644
index e7ab698d19..0000000000
--- a/__tests__/html/carousel.flipperButton.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('Carousel', () => {
- test('should scroll when flipper button is clicked', () =>
- runHTML('carousel.flipperButton.html'));
-});
diff --git a/__tests__/html/carousel.flipperButton.rtl.js b/__tests__/html/carousel.flipperButton.rtl.js
deleted file mode 100644
index e0295d6865..0000000000
--- a/__tests__/html/carousel.flipperButton.rtl.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('Carousel in RTL', () => {
- // TODO: [P1] #3898 Un-skip this one after we bump to Chromium 85+.
- test.skip('should scroll when flipper button is clicked', () =>
- runHTML('carousel.flipperButton.rtl.html'));
-});
diff --git a/__tests__/html/carousel.navigation.tab.cardInput.js b/__tests__/html/carousel.navigation.tab.cardInput.js
deleted file mode 100644
index fc1f3a7758..0000000000
--- a/__tests__/html/carousel.navigation.tab.cardInput.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('carousel navigation', () => {
- describe('should focus on card button when present', () => {
- test('carousel', () => runHTML('carousel.navigation.tab.cardInput.html'));
- });
-});
diff --git a/__tests__/html/carousel.navigation.tab.js b/__tests__/html/carousel.navigation.tab.js
deleted file mode 100644
index 4fe3775e9b..0000000000
--- a/__tests__/html/carousel.navigation.tab.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('carousel navigation', () => {
- test('should show focus when tabbing inside carousel', () => runHTML('carousel.navigation.tab.html'));
-});
diff --git a/__tests__/html/chatAdapter.directLineAppServiceExtension.js b/__tests__/html/chatAdapter.directLineAppServiceExtension.js
deleted file mode 100644
index 711a18f733..0000000000
--- a/__tests__/html/chatAdapter.directLineAppServiceExtension.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('Direct Line App Service Service chat adapter', () => {
- test.skip('should connect to the MockBot.', () => runHTML('chatAdapter.directLineAppServiceExtension.html'));
-});
diff --git a/__tests__/html/chatAdapter.directLineSpeech.js b/__tests__/html/chatAdapter.directLineSpeech.js
deleted file mode 100644
index a1538a3dd1..0000000000
--- a/__tests__/html/chatAdapter.directLineSpeech.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('Direct Line Speech chat adapter', () => {
- test.skip('should connect to the MockBot.', () => runHTML('chatAdapter.directLineSpeech.html'));
-});
diff --git a/__tests__/html/chatAdapter.nullFields.js b/__tests__/html/chatAdapter.nullFields.js
deleted file mode 100644
index bbd0134fd1..0000000000
--- a/__tests__/html/chatAdapter.nullFields.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('chat adapter', () => {
- test('should render properly if some activity fields are null', () => runHTML('chatAdapter.nullFields.html'));
-});
diff --git a/__tests__/html/chatAdapter.reconnect.js b/__tests__/html/chatAdapter.reconnect.js
deleted file mode 100644
index 9108e20b89..0000000000
--- a/__tests__/html/chatAdapter.reconnect.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-test('after reconnect should send and receive message as usual', () => runHTML('chatAdapter.reconnect.html'));
diff --git a/__tests__/html/chatAdapter.sequenceId.directLine.outgoing.js b/__tests__/html/chatAdapter.sequenceId.directLine.outgoing.js
deleted file mode 100644
index 68f93e85e8..0000000000
--- a/__tests__/html/chatAdapter.sequenceId.directLine.outgoing.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-test('should render outgoing activities based on sequence ID', () => runHTML('chatAdapter.sequenceId.directLine.outgoing.html'));
diff --git a/__tests__/html/chatAdapter.sequenceId.noSequenceId.js b/__tests__/html/chatAdapter.sequenceId.noSequenceId.js
deleted file mode 100644
index e0b112bb3b..0000000000
--- a/__tests__/html/chatAdapter.sequenceId.noSequenceId.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-test('should sort activities by fallback to timestamp', () => runHTML('chatAdapter.sequenceId.noSequenceId.html'));
diff --git a/__tests__/html/chatAdapter.sequenceId.simple.js b/__tests__/html/chatAdapter.sequenceId.simple.js
deleted file mode 100644
index da8106df2b..0000000000
--- a/__tests__/html/chatAdapter.sequenceId.simple.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-test('should render incoming activities based on sequence ID', () => runHTML('chatAdapter.sequenceId.simple.html'));
diff --git a/__tests__/html/carousel.flipperButton.html b/__tests__/html2/carousel/flipperButton.html
similarity index 96%
rename from __tests__/html/carousel.flipperButton.html
rename to __tests__/html2/carousel/flipperButton.html
index 0007f3020c..ede4d40938 100644
--- a/__tests__/html/carousel.flipperButton.html
+++ b/__tests__/html2/carousel/flipperButton.html
@@ -40,7 +40,7 @@
await pageConditions.became('Carousel should scroll right', () => carouselFilmstrip.scrollLeft > 100, 1000);
await testHelpers.sleep(500); // Wait both flippers to fade in.
- await host.snapshot();
+ await host.snapshot('local');
// WHEN: Left flipper is clicked.
const leftFlipper = carouselLayout.querySelector('[aria-label="Previous"]');
@@ -58,7 +58,7 @@
); // 1 pixel for tolerance.
await testHelpers.sleep(500); // Wait for right flipper to fade away.
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/carousel-flipper-button-js-carousel-should-scroll-when-flipper-button-is-clicked-1-snap.png b/__tests__/html2/carousel/flipperButton.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/carousel-flipper-button-js-carousel-should-scroll-when-flipper-button-is-clicked-1-snap.png
rename to __tests__/html2/carousel/flipperButton.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/carousel-flipper-button-js-carousel-should-scroll-when-flipper-button-is-clicked-2-snap.png b/__tests__/html2/carousel/flipperButton.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/carousel-flipper-button-js-carousel-should-scroll-when-flipper-button-is-clicked-2-snap.png
rename to __tests__/html2/carousel/flipperButton.html.snap-2.png
diff --git a/__tests__/html/carousel.flipperButton.rtl.html b/__tests__/html2/carousel/flipperButton.rtl.html
similarity index 97%
rename from __tests__/html/carousel.flipperButton.rtl.html
rename to __tests__/html2/carousel/flipperButton.rtl.html
index bbabbc572a..268995d66a 100644
--- a/__tests__/html/carousel.flipperButton.rtl.html
+++ b/__tests__/html2/carousel/flipperButton.rtl.html
@@ -41,7 +41,7 @@
await pageConditions.became('Carousel should scroll left', () => carouselFilmstrip.scrollLeft < -100, 1000);
await testHelpers.sleep(500); // Wait both flippers to fade in.
- await host.snapshot();
+ await host.snapshot('local');
// WHEN: Right flipper is clicked. In RTL, the right flipper goes back.
const rightFlipper = carouselLayout.querySelector('[aria-label="Previous"]');
@@ -59,7 +59,7 @@
); // 1 pixel for tolerance.
await testHelpers.sleep(500); // Wait for right flipper to fade away.
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/html2/carousel/flipperButton.rtl.html.snap-1.png b/__tests__/html2/carousel/flipperButton.rtl.html.snap-1.png
new file mode 100644
index 0000000000..f45dfec358
Binary files /dev/null and b/__tests__/html2/carousel/flipperButton.rtl.html.snap-1.png differ
diff --git a/__tests__/html2/carousel/flipperButton.rtl.html.snap-2.png b/__tests__/html2/carousel/flipperButton.rtl.html.snap-2.png
new file mode 100644
index 0000000000..37440e2356
Binary files /dev/null and b/__tests__/html2/carousel/flipperButton.rtl.html.snap-2.png differ
diff --git a/__tests__/html/carousel.navigation.tab.cardInput.html b/__tests__/html2/carousel/navigation.tab.cardInput.html
similarity index 96%
rename from __tests__/html/carousel.navigation.tab.cardInput.html
rename to __tests__/html2/carousel/navigation.tab.cardInput.html
index 25ab5ec159..79bc2110dc 100644
--- a/__tests__/html/carousel.navigation.tab.cardInput.html
+++ b/__tests__/html2/carousel/navigation.tab.cardInput.html
@@ -32,7 +32,7 @@
// Focus on first card button
await host.sendTab();
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/carousel-navigation-tab-card-input-js-carousel-navigation-should-focus-on-card-button-when-present-carousel-1-snap.png b/__tests__/html2/carousel/navigation.tab.cardInput.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/carousel-navigation-tab-card-input-js-carousel-navigation-should-focus-on-card-button-when-present-carousel-1-snap.png
rename to __tests__/html2/carousel/navigation.tab.cardInput.html.snap-1.png
diff --git a/__tests__/html/carousel.navigation.tab.html b/__tests__/html2/carousel/navigation.tab.html
similarity index 95%
rename from __tests__/html/carousel.navigation.tab.html
rename to __tests__/html2/carousel/navigation.tab.html
index 98e266fe1e..e8095f8678 100644
--- a/__tests__/html/carousel.navigation.tab.html
+++ b/__tests__/html2/carousel/navigation.tab.html
@@ -41,7 +41,7 @@
document.activeElement === document.activeElement.parentElement.children[0],
1000
);
- await host.snapshot();
+ await host.snapshot('local');
// Second focus is not very stable because of its position, we are skipping snapshotting it.
// Third focus inside carousel
@@ -59,7 +59,7 @@
5,
5000
);
- await host.snapshot();
+ await host.snapshot('local');
// Press ESCAPE key should focus the activity.
await host.sendKeys('ESCAPE');
@@ -74,7 +74,7 @@
5,
5000
);
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/carousel-navigation-tab-js-carousel-navigation-should-show-focus-when-tabbing-inside-carousel-1-snap.png b/__tests__/html2/carousel/navigation.tab.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/carousel-navigation-tab-js-carousel-navigation-should-show-focus-when-tabbing-inside-carousel-1-snap.png
rename to __tests__/html2/carousel/navigation.tab.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/carousel-navigation-tab-js-carousel-navigation-should-show-focus-when-tabbing-inside-carousel-2-snap.png b/__tests__/html2/carousel/navigation.tab.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/carousel-navigation-tab-js-carousel-navigation-should-show-focus-when-tabbing-inside-carousel-2-snap.png
rename to __tests__/html2/carousel/navigation.tab.html.snap-2.png
diff --git a/__tests__/__image_snapshots__/html/carousel-navigation-tab-js-carousel-navigation-should-show-focus-when-tabbing-inside-carousel-3-snap.png b/__tests__/html2/carousel/navigation.tab.html.snap-3.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/carousel-navigation-tab-js-carousel-navigation-should-show-focus-when-tabbing-inside-carousel-3-snap.png
rename to __tests__/html2/carousel/navigation.tab.html.snap-3.png
diff --git a/__tests__/html/chatAdapter.directLineAppServiceExtension.html b/__tests__/html2/chatAdapter/directLineAppServiceExtension.html
similarity index 96%
rename from __tests__/html/chatAdapter.directLineAppServiceExtension.html
rename to __tests__/html2/chatAdapter/directLineAppServiceExtension.html
index af4f9cb00d..a6396d2bb3 100644
--- a/__tests__/html/chatAdapter.directLineAppServiceExtension.html
+++ b/__tests__/html2/chatAdapter/directLineAppServiceExtension.html
@@ -24,7 +24,7 @@
await pageObjects.sendMessageViaSendBox('echo Hello, World!', { waitForSend: true });
await pageConditions.minNumActivitiesShown(3);
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/chat-adapter-direct-line-app-service-extension-js-direct-line-app-service-service-chat-adapter-should-connect-to-the-mock-bot-1-snap.png b/__tests__/html2/chatAdapter/directLineAppServiceExtension.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/chat-adapter-direct-line-app-service-extension-js-direct-line-app-service-service-chat-adapter-should-connect-to-the-mock-bot-1-snap.png
rename to __tests__/html2/chatAdapter/directLineAppServiceExtension.html.snap-1.png
diff --git a/__tests__/html/chatAdapter.directLineSpeech.html b/__tests__/html2/chatAdapter/directLineSpeech.skip.html
similarity index 100%
rename from __tests__/html/chatAdapter.directLineSpeech.html
rename to __tests__/html2/chatAdapter/directLineSpeech.skip.html
diff --git a/__tests__/html/chatAdapter.nullFields.html b/__tests__/html2/chatAdapter/nullFields.html
similarity index 98%
rename from __tests__/html/chatAdapter.nullFields.html
rename to __tests__/html2/chatAdapter/nullFields.html
index 3ab12ea513..3bf65e0cc6 100644
--- a/__tests__/html/chatAdapter.nullFields.html
+++ b/__tests__/html2/chatAdapter/nullFields.html
@@ -74,7 +74,7 @@
await pageConditions.suggestedActionsShown();
await pageConditions.allImagesLoaded();
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/chat-adapter-null-fields-js-chat-adapter-should-render-properly-if-some-activity-fields-are-null-1-snap.png b/__tests__/html2/chatAdapter/nullFields.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/chat-adapter-null-fields-js-chat-adapter-should-render-properly-if-some-activity-fields-are-null-1-snap.png
rename to __tests__/html2/chatAdapter/nullFields.html.snap-1.png
diff --git a/__tests__/html/chatAdapter.reconnect.html b/__tests__/html2/chatAdapter/reconnect.html
similarity index 100%
rename from __tests__/html/chatAdapter.reconnect.html
rename to __tests__/html2/chatAdapter/reconnect.html
diff --git a/__tests__/html/chatAdapter.sequenceId.directLine.outgoing.html b/__tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html
similarity index 98%
rename from __tests__/html/chatAdapter.sequenceId.directLine.outgoing.html
rename to __tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html
index cdf2d1b043..4be1a4f4fc 100644
--- a/__tests__/html/chatAdapter.sequenceId.directLine.outgoing.html
+++ b/__tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html
@@ -103,7 +103,7 @@
expect(sending[1].activity.channelData.state).toBeUndefined();
// THEN: It should show message in order of "2", "1", followed by "0".
- await host.snapshot();
+ await host.snapshot('local');
// WHEN: The first message has echoed back with a timestamp of 1.
sending[0].resolve({
@@ -122,7 +122,7 @@
// THEN: It should show message in the order of "1", "2", followed by "0".
// "1" should be marked as sent.
// "0" should be sending.
- await host.snapshot();
+ await host.snapshot('local');
// THEN: The first outgoing message should appears first, before the bot's message.
// The first outgoing message has a smaller timestamp (t=1) than the bot's message (t=2).
@@ -150,7 +150,7 @@
]);
// THEN: It should show message in the order of "0", "1", followed by "2".
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/chat-adapter-sequence-id-direct-line-outgoing-js-should-render-outgoing-activities-based-on-sequence-id-1-snap.png b/__tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/chat-adapter-sequence-id-direct-line-outgoing-js-should-render-outgoing-activities-based-on-sequence-id-1-snap.png
rename to __tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/chat-adapter-sequence-id-direct-line-outgoing-js-should-render-outgoing-activities-based-on-sequence-id-2-snap.png b/__tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/chat-adapter-sequence-id-direct-line-outgoing-js-should-render-outgoing-activities-based-on-sequence-id-2-snap.png
rename to __tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html.snap-2.png
diff --git a/__tests__/__image_snapshots__/html/chat-adapter-sequence-id-direct-line-outgoing-js-should-render-outgoing-activities-based-on-sequence-id-3-snap.png b/__tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html.snap-3.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/chat-adapter-sequence-id-direct-line-outgoing-js-should-render-outgoing-activities-based-on-sequence-id-3-snap.png
rename to __tests__/html2/chatAdapter/sequenceId.directLine.outgoing.html.snap-3.png
diff --git a/__tests__/html/chatAdapter.sequenceId.noSequenceId.html b/__tests__/html2/chatAdapter/sequenceId.noSequenceId.html
similarity index 97%
rename from __tests__/html/chatAdapter.sequenceId.noSequenceId.html
rename to __tests__/html2/chatAdapter/sequenceId.noSequenceId.html
index b74cf0e935..380d4dc3e1 100644
--- a/__tests__/html/chatAdapter.sequenceId.noSequenceId.html
+++ b/__tests__/html2/chatAdapter/sequenceId.noSequenceId.html
@@ -44,7 +44,7 @@
await pageConditions.scrollToBottomCompleted();
// THEN: It should show a chat history sorted based on "ts" field.
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/chat-adapter-sequence-id-no-sequence-id-js-should-sort-activities-by-fallback-to-timestamp-1-snap.png b/__tests__/html2/chatAdapter/sequenceId.noSequenceId.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/chat-adapter-sequence-id-no-sequence-id-js-should-sort-activities-by-fallback-to-timestamp-1-snap.png
rename to __tests__/html2/chatAdapter/sequenceId.noSequenceId.html.snap-1.png
diff --git a/__tests__/html/chatAdapter.sequenceId.simple.html b/__tests__/html2/chatAdapter/sequenceId.simple.html
similarity index 97%
rename from __tests__/html/chatAdapter.sequenceId.simple.html
rename to __tests__/html2/chatAdapter/sequenceId.simple.html
index 0a0601e9af..00079b6af2 100644
--- a/__tests__/html/chatAdapter.sequenceId.simple.html
+++ b/__tests__/html2/chatAdapter/sequenceId.simple.html
@@ -48,7 +48,7 @@
await pageConditions.scrollToBottomCompleted();
// THEN: It should show a transcript sorted based on "seq" field.
- await host.snapshot();
+ await host.snapshot('local');
});
diff --git a/__tests__/__image_snapshots__/html/chat-adapter-sequence-id-simple-js-should-render-incoming-activities-based-on-sequence-id-1-snap.png b/__tests__/html2/chatAdapter/sequenceId.simple.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/chat-adapter-sequence-id-simple-js-should-render-incoming-activities-based-on-sequence-id-1-snap.png
rename to __tests__/html2/chatAdapter/sequenceId.simple.html.snap-1.png