Skip to content

Commit a64dcd0

Browse files
authored
Merge branch 'main' into locfiles/51ffd811-bddd-40b6-bb03-6b932057433a
2 parents 31be6ef + 5351921 commit a64dcd0

138 files changed

Lines changed: 1860 additions & 619 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pull-request-validation.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,23 @@ jobs:
8282
path: docker.zip
8383
retention-days: 1
8484

85+
build-browser:
86+
name: Build test harness
87+
runs-on: windows-latest
88+
89+
steps:
90+
- uses: actions/checkout@v4
91+
92+
- name: Use Node.js ${{ env.node-version }}
93+
uses: actions/setup-node@v4
94+
with:
95+
node-version: ${{ env.node-version }}
96+
cache: npm
97+
98+
- run: npm clean-install --ignore-scripts --strict-peer-deps
99+
100+
- run: npm run build-browser
101+
85102
build-samples:
86103
name: Build samples
87104
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 8 additions & 1 deletion

__tests__/html2/accessibility/adaptiveCard/withTapAction.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
await host.sendShiftTab();
3131

3232
const focusingOnRoot =
33-
document.activeElement === document.querySelector('.webchat__adaptive-card-renderer').firstChild;
33+
document.activeElement === document.querySelector('.adaptive-card-renderer').firstChild;
3434

3535
expect(focusingOnRoot).toBe(true);
3636

__tests__/html2/accessibility/attachment/aria.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
await pageConditions.scrollToBottomCompleted();
3939

4040
const carouselContainer = document
41-
.querySelector('.webchat__carousel-filmstrip')
41+
.querySelector('.carousel-filmstrip')
4242
.getAttribute('aria-labelledby');
4343

4444
expect(carouselContainer).toBeFalsy();

__tests__/html2/accessibility/attachment/stackedLayoutRole.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
await pageConditions.minNumActivitiesShown(2);
2424
await pageConditions.scrollToBottomCompleted();
2525

26-
const attachmentRole = document.querySelector('.webchat__carousel-filmstrip-attachment').getAttribute('role');
26+
const attachmentRole = document.querySelector('.carousel-filmstrip-attachment').getAttribute('role');
2727

2828
expect(attachmentRole).toBeTruthy();
2929
});

__tests__/html2/accessibility/liveRegion/attachment/animationCard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
await pageConditions.minNumActivitiesShown(2);
5252

5353
// Replace the animation with a static image.
54-
for (const imageElement of document.querySelectorAll('.webchat__bubble__content img')) {
54+
for (const imageElement of document.querySelectorAll('.bubble__content img')) {
5555
imageElement.setAttribute(
5656
'src',
5757
'https://raw.githubusercontent.com/compulim/BotFramework-MockBot/master/public/assets/surface1.jpg'

__tests__/html2/activity/citation.longRef.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
await host.snapshot('local');
5555

56-
const markdownElement = pageElements.activities()[0].querySelector('.webchat__text-content__markdown');
56+
const markdownElement = pageElements.activities()[0].querySelector('.text-content__markdown');
5757
const markdownLinks = markdownElement.querySelectorAll('a');
5858
const markdownButtons = markdownElement.querySelectorAll('button');
5959

__tests__/html2/adaptiveCard/rerender.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
]
6767
});
6868

69-
const adaptiveCardEl = document.querySelector('.webchat__adaptive-card-renderer');
69+
const adaptiveCardEl = document.querySelector('.adaptive-card-renderer');
7070
const [currentRenderedChild] = adaptiveCardEl.children;
7171

7272
await new Promise(resolve => setTimeout(resolve, 200));

__tests__/html2/adaptiveCard/tapAction.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// When using runHookActivityMiddleware, an additional hidden activities will be rendered to run the hook function. Thus, minNumActivitiesShown must be +1.
5252
await pageConditions.numActivitiesShown(1);
5353

54-
const renderer = document.querySelector('.webchat__adaptive-card-renderer');
54+
const renderer = document.querySelector('.adaptive-card-renderer');
5555
const card = renderer.querySelector('.ac-adaptiveCard[tabindex="0"]');
5656

5757
expect(card).toBeTruthy();

__tests__/html2/basic/customIcons.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
--webchat__fluent-icon--mask: var(--icon);
4040
}
4141

42-
#webchat .webchat__activity-button .component-icon.icon--view-code {
42+
#webchat .activity-button .component-icon.icon--view-code {
4343
--webchat__component-icon--mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath fill='%23000' d='M8 17.308L2.692 12L8 6.692l.714.714l-4.6 4.6L8.708 16.6zm8 0l-.713-.714l4.6-4.6L15.292 7.4L16 6.692L21.308 12z'/%3E%3C/svg%3E");
4444
}
4545

46-
#webchat .webchat__activity-button .component-icon.icon--copy {
46+
#webchat .activity-button .component-icon.icon--copy {
4747
--webchat__component-icon--mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath fill='%23000' d='M9.116 17q-.691 0-1.153-.462T7.5 15.385V4.615q0-.69.463-1.153T9.116 3h7.769q.69 0 1.153.462t.462 1.153v10.77q0 .69-.462 1.152T16.884 17zm0-1h7.769q.23 0 .423-.192t.192-.423V4.615q0-.23-.192-.423T16.884 4H9.116q-.231 0-.424.192t-.192.423v10.77q0 .23.192.423t.423.192m-3 4q-.69 0-1.153-.462T4.5 18.385V6.615h1v11.77q0 .23.192.423t.423.192h8.77v1zM8.5 16V4z'/%3E%3C/svg%3E");
4848
}
4949
</style>

0 commit comments

Comments
 (0)