Skip to content

Commit 55c7a6b

Browse files
OEvgenyOEvgeny
committed
Fix message status tests
1 parent c566238 commit 55c7a6b

10 files changed

+84
-38
lines changed

‎__tests__/html2/activity/message-status.copilot.skip.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<title>Message status (copilot)</title>
5+
<script>
6+
location = './message-status?variant=copilot';
7+
</script>
8+
</head>
9+
<body></body>
10+
</html>

‎__tests__/html2/activity/message-status.fluent.skip.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<title>Message status (fluent)</title>
5+
<script>
6+
location = './message-status?variant=fluent';
7+
</script>
8+
</head>
9+
<body></body>
10+
</html>

‎__tests__/html2/activity/message-status.html‎

Lines changed: 63 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,26 @@
22
<html lang="en-US">
33

44
<head>
5-
<title>Status: basic</title>
5+
<title>Message status</title>
66
<link href="/assets/index.css" rel="stylesheet" type="text/css" />
77
<script type="importmap">
8-
{
9-
"imports": {
10-
"react": "https://esm.sh/react@18.3.1",
11-
"react-dom": "https://esm.sh/react-dom@18.3.1",
12-
"react-dom/": "https://esm.sh/react-dom@18.3.1/",
13-
"@testduet/wait-for": "https://unpkg.com/@testduet/wait-for@main/dist/wait-for.mjs",
14-
"@fluentui/react-components": "https://esm.sh/@fluentui/react-components?deps=react@18.3.1&exports=FluentProvider,createDarkTheme,webLightTheme"
15-
}
8+
{
9+
"imports": {
10+
"@fluentui/react-provider": "https://esm.sh/@fluentui/react-provider?deps=react@18&exports=FluentProvider",
11+
"@fluentui/tokens": "https://esm.sh/@fluentui/tokens?deps=react@18&exports=createDarkTheme,webLightTheme",
12+
"@testduet/wait-for": "https://unpkg.com/@testduet/wait-for@main/dist/wait-for.mjs",
13+
"botframework-webchat": "/__dist__/packages/bundle/static/botframework-webchat.js",
14+
"botframework-webchat/decorator": "/__dist__/packages/bundle/static/botframework-webchat/decorator.js",
15+
"botframework-webchat/internal": "/__dist__/packages/bundle/static/botframework-webchat/internal.js",
16+
"botframework-webchat-fluent-theme": "/__dist__/packages/fluent-theme/static/botframework-webchat-fluent-theme.js",
17+
"react": "https://esm.sh/react@18",
18+
"react-dom": "https://esm.sh/react-dom@18",
19+
"react-dom/": "https://esm.sh/react-dom@18/"
1620
}
17-
</script>
21+
}
22+
</script>
1823
<script crossorigin="anonymous" src="/test-harness.js"></script>
1924
<script crossorigin="anonymous" src="/test-page-object.js"></script>
20-
<script type="module">
21-
import React from 'react';
22-
window.React = React;
23-
</script>
24-
<script defer crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script>
25-
<script defer crossorigin="anonymous" src="/__dist__/botframework-webchat-fluent-theme.development.js"></script>
2625
<style type="text/css">
2726
#webchat {
2827
width: 640px;
@@ -41,17 +40,26 @@
4140
<body>
4241
<main id="webchat"></main>
4342
<script type="module">
44-
import React from 'react';
45-
import { createRoot } from 'react-dom/client';
46-
import { FluentProvider, createDarkTheme, webLightTheme } from '@fluentui/react-components';
43+
import '/test-harness.mjs';
44+
import '/test-page-object.mjs';
45+
46+
import { createDarkTheme, webLightTheme } from '@fluentui/tokens';
47+
import { FluentProvider } from '@fluentui/react-provider';
4748
import { waitFor } from '@testduet/wait-for';
49+
import { createDirectLine, createStoreWithOptions, ReactWebChat } from 'botframework-webchat';
50+
import { FluentThemeProvider } from 'botframework-webchat-fluent-theme';
51+
import { createElement } from 'react';
52+
import { createRoot } from 'react-dom/client';
4853

49-
run(async function () {
50-
const {
51-
WebChat: { FluentThemeProvider, ReactWebChat }
52-
} = window;
54+
const {
55+
testHelpers: { createDirectLineEmulator }
56+
} = window;
5357

54-
const { directLine, store } = testHelpers.createDirectLineEmulator();
58+
// TODO: This is for `createDirectLineEmulator` only, should find ways to eliminate this line.
59+
window.WebChat = { createStoreWithOptions };
60+
61+
run(async function () {
62+
const { directLine, store } = createDirectLineEmulator();
5563

5664
const searchParams = new URLSearchParams(location.search);
5765
const variant = searchParams.get('variant');
@@ -115,22 +123,29 @@
115123

116124
root.render(
117125
variant === 'copilot' || variant === 'fluent' ?
118-
React.createElement(
126+
createElement(
119127
FluentProvider,
120128
{ className: 'fui-FluentProvider', theme: fluentTheme },
121-
React.createElement(
129+
createElement(
122130
FluentThemeProvider,
123131
{ variant: variant },
124-
React.createElement(ReactWebChat, webChatProps)
132+
createElement(ReactWebChat, webChatProps)
125133
)
126134
) :
127-
React.createElement(ReactWebChat, webChatProps)
135+
createElement(ReactWebChat, webChatProps)
128136
);
129137

130138
await pageConditions.uiConnected();
131139

132140
const botIcon = 'data:image/png;base64,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';
133141

142+
const author = {
143+
'@context': 'https://schema.org',
144+
'@type': 'Person',
145+
image: botIcon,
146+
name: 'Agent',
147+
};
148+
134149
directLine.emulateIncomingActivity({
135150
from: { role: 'user' },
136151
type: 'message',
@@ -148,6 +163,7 @@
148163
'@type': 'Message',
149164
type: 'https://schema.org/Message',
150165
abstract: 'Response without status',
166+
author
151167
}]
152168
});
153169

@@ -164,6 +180,7 @@
164180
'@type': 'Message',
165181
type: 'https://schema.org/Message',
166182
abstract: 'Another response without status',
183+
author
167184
}]
168185
});
169186

@@ -182,7 +199,8 @@
182199
'@type': 'Message',
183200
type: 'https://schema.org/Message',
184201
abstract: 'Response in progress...',
185-
creativeWorkStatus: 'incomplete'
202+
creativeWorkStatus: 'incomplete',
203+
author
186204
}]
187205
});
188206

@@ -201,7 +219,8 @@
201219
'@type': 'Message',
202220
type: 'https://schema.org/Message',
203221
abstract: 'Response completed!',
204-
creativeWorkStatus: 'published'
222+
creativeWorkStatus: 'published',
223+
author
205224
}]
206225
});
207226

@@ -221,7 +240,8 @@
221240
'@type': 'Message',
222241
type: 'https://schema.org/Message',
223242
abstract: 'Second message - published',
224-
creativeWorkStatus: 'published'
243+
creativeWorkStatus: 'published',
244+
author
225245
}]
226246
});
227247

@@ -236,7 +256,8 @@
236256
'@type': 'Message',
237257
type: 'https://schema.org/Message',
238258
abstract: 'Third message - in progress',
239-
creativeWorkStatus: 'incomplete'
259+
creativeWorkStatus: 'incomplete',
260+
author
240261
}]
241262
});
242263

@@ -251,7 +272,8 @@
251272
'@type': 'Message',
252273
type: 'https://schema.org/Message',
253274
abstract: 'Fourth message - no status',
254-
creativeWorkStatus: 'incomplete'
275+
creativeWorkStatus: 'incomplete',
276+
author
255277
}]
256278
});
257279

@@ -271,7 +293,8 @@
271293
'@type': 'Message',
272294
type: 'https://schema.org/Message',
273295
abstract: 'Third message - now complete',
274-
creativeWorkStatus: 'published'
296+
creativeWorkStatus: 'published',
297+
author
275298
}]
276299
});
277300

@@ -287,7 +310,8 @@
287310
'@type': 'Message',
288311
type: 'https://schema.org/Message',
289312
abstract: 'Fourth message - now loading',
290-
creativeWorkStatus: 'incomplete'
313+
creativeWorkStatus: 'incomplete',
314+
author
291315
}]
292316
});
293317

@@ -307,7 +331,8 @@
307331
'@type': 'Message',
308332
type: 'https://schema.org/Message',
309333
abstract: 'Fourth message - final completion',
310-
creativeWorkStatus: 'published'
334+
creativeWorkStatus: 'published',
335+
author
311336
}]
312337
});
313338

@@ -326,7 +351,8 @@
326351
'@context': 'https://schema.org',
327352
'@type': 'Message',
328353
type: 'https://schema.org/Message',
329-
creativeWorkStatus: 'published'
354+
creativeWorkStatus: 'published',
355+
author
330356
}]
331357
});
332358

‎__tests__/html2/activity/message-status.html.snap-2.png‎

10 Bytes
Loading

‎__tests__/html2/activity/message-status.html.snap-3.png‎

-24 Bytes
Loading

‎__tests__/html2/activity/message-status.html.snap-4.png‎

-124 Bytes
Loading

‎__tests__/html2/activity/message-status.html.snap-5.png‎

-111 Bytes
Loading

‎__tests__/html2/activity/message-status.html.snap-6.png‎

-121 Bytes
Loading

‎__tests__/html2/activity/message-status.html.snap-7.png‎

-123 Bytes
Loading

‎packages/component/src/Activity/StackedLayout.module.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
}
117117

118118
+ :global(.webchat__text-content) {
119-
transform: translateY(0.025em);
119+
transform: translateY(0.15em);
120120
}
121121
}
122122

0 commit comments

Comments
 (0)