Skip to content

Commit 19ed919

Browse files
chrisbobbegnprice
authored andcommitted
content test [nfc]: s/prepareContentBare/prepareContent/
1 parent 40f93af commit 19ed919

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

test/widgets/content_test.dart

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void main() {
104104
// TODO(#488) For content that we need to show outside a per-message context
105105
// or a context without a full PerAccountStore, make sure to include tests
106106
// that don't provide such context.
107-
Future<void> prepareContentBare(WidgetTester tester, Widget child, {
107+
Future<void> prepareContent(WidgetTester tester, Widget child, {
108108
List<NavigatorObserver> navObservers = const [],
109109
bool wrapWithPerAccountStoreWidget = false,
110110
}) async {
@@ -140,11 +140,11 @@ void main() {
140140
///
141141
/// This requires [ContentExample.expectedText] to be non-null in order to
142142
/// check that the content has actually rendered. For examples where there's
143-
/// no suitable value for [ContentExample.expectedText], use [prepareContentBare]
143+
/// no suitable value for [ContentExample.expectedText], use [prepareContent]
144144
/// and write an appropriate content-has-rendered check directly.
145145
void testContentSmoke(ContentExample example) {
146146
testWidgets('smoke: ${example.description}', (tester) async {
147-
await prepareContentBare(tester, plainContent(example.html));
147+
await prepareContent(tester, plainContent(example.html));
148148
assert(example.expectedText != null,
149149
'testContentExample requires expectedText');
150150
tester.widget(find.text(example.expectedText!));
@@ -153,21 +153,21 @@ void main() {
153153

154154
group('ThematicBreak', () {
155155
testWidgets('smoke ThematicBreak', (tester) async {
156-
await prepareContentBare(tester, plainContent(ContentExample.thematicBreak.html));
156+
await prepareContent(tester, plainContent(ContentExample.thematicBreak.html));
157157
tester.widget(find.byType(ThematicBreak));
158158
});
159159
});
160160

161161
group('Heading', () {
162162
testWidgets('plain h6', (tester) async {
163-
await prepareContentBare(tester,
163+
await prepareContent(tester,
164164
// "###### six"
165165
plainContent('<h6>six</h6>'));
166166
tester.widget(find.text('six'));
167167
});
168168

169169
testWidgets('smoke test for h1, h2, h3, h4, h5', (tester) async {
170-
await prepareContentBare(tester,
170+
await prepareContent(tester,
171171
// "# one\n## two\n### three\n#### four\n##### five"
172172
plainContent('<h1>one</h1>\n<h2>two</h2>\n<h3>three</h3>\n<h4>four</h4>\n<h5>five</h5>'));
173173
check(find.byType(Heading).evaluate()).length.equals(5);
@@ -184,13 +184,13 @@ void main() {
184184
final pushedRoutes = <Route<dynamic>>[];
185185
final testNavObserver = TestNavigatorObserver()
186186
..onPushed = (route, prevRoute) => pushedRoutes.add(route);
187-
await prepareContentBare(tester,
187+
await prepareContent(tester,
188188
// Message is needed for the image's lightbox.
189189
messageContent(html),
190190
navObservers: [testNavObserver],
191191
// We try to resolve the image's URL on the self-account's realm.
192192
wrapWithPerAccountStoreWidget: true);
193-
// `tester.pumpWidget` in prepareContentBare introduces an initial route;
193+
// `tester.pumpWidget` in prepareContent introduces an initial route;
194194
// remove it so consumers only have newly pushed routes.
195195
assert(pushedRoutes.length == 1);
196196
pushedRoutes.removeLast();
@@ -258,7 +258,7 @@ void main() {
258258

259259
group('MessageImage, MessageImageList', () {
260260
Future<void> prepare(WidgetTester tester, String html) async {
261-
await prepareContentBare(tester,
261+
await prepareContent(tester,
262262
// Message is needed for an image's lightbox.
263263
messageContent(html),
264264
// We try to resolve image URLs on the self-account's realm.
@@ -347,7 +347,7 @@ void main() {
347347
final pushedRoutes = <Route<dynamic>>[];
348348
final testNavObserver = TestNavigatorObserver()
349349
..onPushed = (route, prevRoute) => pushedRoutes.add(route);
350-
await prepareContentBare(tester,
350+
await prepareContent(tester,
351351
// Message is needed for a video's lightbox.
352352
messageContent(html),
353353
navObservers: [testNavObserver],
@@ -357,7 +357,7 @@ void main() {
357357
// self-account's realm, we'll request it with the auth credential.
358358
// TODO(#656) in above comment, change "we will" to "we do"
359359
wrapWithPerAccountStoreWidget: true);
360-
// `tester.pumpWidget` in prepareContentBare introduces an initial route;
360+
// `tester.pumpWidget` in prepareContent introduces an initial route;
361361
// remove it so consumers only have newly pushed routes.
362362
assert(pushedRoutes.length == 1);
363363
pushedRoutes.removeLast();
@@ -376,7 +376,7 @@ void main() {
376376

377377
group("MessageEmbedVideo", () {
378378
Future<void> prepare(WidgetTester tester, String html) async {
379-
await prepareContentBare(tester,
379+
await prepareContent(tester,
380380
// Message is needed for a video's lightbox.
381381
messageContent(html),
382382
// We try to resolve a video preview URL on the self-account's realm.
@@ -441,7 +441,7 @@ void main() {
441441
required String targetHtml,
442442
required double Function(InlineSpan rootSpan) targetFontSizeFinder,
443443
}) async {
444-
await prepareContentBare(tester, plainContent(
444+
await prepareContent(tester, plainContent(
445445
'<h1>header-plain $targetHtml</h1>\n'
446446
'<p>paragraph-plain $targetHtml</p>'));
447447

@@ -520,7 +520,7 @@ void main() {
520520
// We use this to simulate taps on specific glyphs.
521521

522522
Future<void> prepare(WidgetTester tester, String html) async {
523-
await prepareContentBare(tester, plainContent(html),
523+
await prepareContent(tester, plainContent(html),
524524
// We try to resolve relative links on the self-account's realm.
525525
wrapWithPerAccountStoreWidget: true);
526526
}
@@ -616,12 +616,12 @@ void main() {
616616
final testNavObserver = TestNavigatorObserver()
617617
..onPushed = (route, prevRoute) => pushedRoutes.add(route);
618618

619-
await prepareContentBare(tester, plainContent(html),
619+
await prepareContent(tester, plainContent(html),
620620
navObservers: [testNavObserver],
621621
// We try to resolve relative links on the self-account's realm.
622622
wrapWithPerAccountStoreWidget: true);
623623

624-
// `tester.pumpWidget` in prepareContentBare introduces an initial route;
624+
// `tester.pumpWidget` in prepareContent introduces an initial route;
625625
// remove it so consumers only have newly pushed routes.
626626
assert(pushedRoutes.length == 1);
627627
pushedRoutes.removeLast();
@@ -684,12 +684,12 @@ void main() {
684684
final renderedTextRegexp = RegExp(r'^(Tue, Jan 30|Wed, Jan 31), 2024, \d+:\d\d [AP]M$');
685685

686686
testWidgets('smoke', (tester) async {
687-
await prepareContentBare(tester, plainContent('<p>$timeSpanHtml</p>'));
687+
await prepareContent(tester, plainContent('<p>$timeSpanHtml</p>'));
688688
tester.widget(find.textContaining(renderedTextRegexp));
689689
});
690690

691691
testWidgets('clock icon and text are the same color', (tester) async {
692-
await prepareContentBare(tester,
692+
await prepareContent(tester,
693693
DefaultTextStyle(style: const TextStyle(color: Colors.green),
694694
child: plainContent('<p>$timeSpanHtml</p>')));
695695

@@ -749,7 +749,7 @@ void main() {
749749

750750
group('MessageImageEmoji', () {
751751
Future<void> prepare(WidgetTester tester, String html) async {
752-
await prepareContentBare(tester, plainContent(html),
752+
await prepareContent(tester, plainContent(html),
753753
// We try to resolve image-emoji URLs on the self-account's realm.
754754
// For URLs on the self-account's realm, we include the auth credential.
755755
wrapWithPerAccountStoreWidget: true);

0 commit comments

Comments
 (0)