Skip to content

Commit 08f31a3

Browse files
chrisbobbegnprice
authored andcommitted
content test [nfc]: Take child instead of html
1 parent e3b6296 commit 08f31a3

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

test/widgets/content_test.dart

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,15 @@ void main() {
9292

9393
TestZulipBinding.ensureInitialized();
9494

95-
Future<void> prepareContentBare(WidgetTester tester, String html, {
95+
Widget plainContent(String html) {
96+
return BlockContentList(nodes: parseContent(html).nodes);
97+
}
98+
99+
Future<void> prepareContentBare(WidgetTester tester, Widget child, {
96100
List<NavigatorObserver> navObservers = const [],
97101
bool wrapWithPerAccountStoreWidget = false,
98102
}) async {
99-
Widget widget = BlockContentList(nodes: parseContent(html).nodes);
103+
Widget widget = child;
100104

101105
if (wrapWithPerAccountStoreWidget) {
102106
await testBinding.globalStore.add(eg.selfAccount, eg.initialSnapshot());
@@ -132,7 +136,7 @@ void main() {
132136
/// and write an appropriate content-has-rendered check directly.
133137
void testContentSmoke(ContentExample example) {
134138
testWidgets('smoke: ${example.description}', (tester) async {
135-
await prepareContentBare(tester, example.html);
139+
await prepareContentBare(tester, plainContent(example.html));
136140
assert(example.expectedText != null,
137141
'testContentExample requires expectedText');
138142
tester.widget(find.text(example.expectedText!));
@@ -141,7 +145,7 @@ void main() {
141145

142146
group('ThematicBreak', () {
143147
testWidgets('smoke ThematicBreak', (tester) async {
144-
await prepareContentBare(tester, ContentExample.thematicBreak.html);
148+
await prepareContentBare(tester, plainContent(ContentExample.thematicBreak.html));
145149
tester.widget(find.byType(ThematicBreak));
146150
});
147151
});
@@ -150,14 +154,14 @@ void main() {
150154
testWidgets('plain h6', (tester) async {
151155
await prepareContentBare(tester,
152156
// "###### six"
153-
'<h6>six</h6>');
157+
plainContent('<h6>six</h6>'));
154158
tester.widget(find.text('six'));
155159
});
156160

157161
testWidgets('smoke test for h1, h2, h3, h4, h5', (tester) async {
158162
await prepareContentBare(tester,
159163
// "# one\n## two\n### three\n#### four\n##### five"
160-
'<h1>one</h1>\n<h2>two</h2>\n<h3>three</h3>\n<h4>four</h4>\n<h5>five</h5>');
164+
plainContent('<h1>one</h1>\n<h2>two</h2>\n<h3>three</h3>\n<h4>four</h4>\n<h5>five</h5>'));
161165
check(find.byType(Heading).evaluate()).length.equals(5);
162166
});
163167
});
@@ -454,9 +458,9 @@ void main() {
454458
required String targetHtml,
455459
required double Function(InlineSpan rootSpan) targetFontSizeFinder,
456460
}) async {
457-
await prepareContentBare(tester,
461+
await prepareContentBare(tester, plainContent(
458462
'<h1>header-plain $targetHtml</h1>\n'
459-
'<p>paragraph-plain $targetHtml</p>');
463+
'<p>paragraph-plain $targetHtml</p>'));
460464

461465
final headerRootSpan = tester.renderObject<RenderParagraph>(find.textContaining('header')).text;
462466
final headerPlainStyle = mergedStyleOfSubstring(headerRootSpan, 'header-plain ');
@@ -708,7 +712,7 @@ void main() {
708712
final renderedTextRegexp = RegExp(r'^(Tue, Jan 30|Wed, Jan 31), 2024, \d+:\d\d [AP]M$');
709713

710714
testWidgets('smoke', (tester) async {
711-
await prepareContentBare(tester, '<p>$timeSpanHtml</p>');
715+
await prepareContentBare(tester, plainContent('<p>$timeSpanHtml</p>'));
712716
tester.widget(find.textContaining(renderedTextRegexp));
713717
});
714718

0 commit comments

Comments
 (0)