-
Notifications
You must be signed in to change notification settings - Fork 235
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
compose: Enforce max topic/content length by code points, following API #1239
Open
chrisbobbe
wants to merge
6
commits into
zulip:main
Choose a base branch
from
chrisbobbe:pr-topic-content-length-code-points
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+171
−14
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
eaff325
compose [nfc]: Add a TODO(#1238)
chrisbobbe 10e78de
compose [nfc]: Comment on max-topic-length check about cutting off short
chrisbobbe fa09289
compose test [nfc]: Give enterTopic a dartdoc
chrisbobbe f4c5ff3
test [nfc]: Factor out `checkNoErrorDialog` helper
chrisbobbe 3708cb4
compose test: Test topic- and content-max-length validation errors
chrisbobbe e18196d
compose: Enforce max topic/content length by code points, following API
chrisbobbe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -79,6 +79,7 @@ void main() { | |
controller = tester.state<ComposeBoxState>(find.byType(ComposeBox)).controller; | ||
} | ||
|
||
/// Set the topic input's text to [topic], using [WidgetTester.enterText]. | ||
Future<void> enterTopic(WidgetTester tester, { | ||
required ChannelNarrow narrow, | ||
required String topic, | ||
|
@@ -94,6 +95,23 @@ void main() { | |
..url.path.equals('/api/v1/users/me/${narrow.streamId}/topics'); | ||
} | ||
|
||
/// Set the content input's text to [content], using [WidgetTester.enterText]. | ||
Future<void> enterContent(WidgetTester tester, { | ||
required ChannelNarrow narrow, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks like this is unused. For entering content, just having |
||
required String content, | ||
}) async { | ||
final contentInputFinder = find.byWidgetPredicate( | ||
(widget) => widget is TextField && widget.controller is ComposeContentController); | ||
|
||
await tester.enterText(contentInputFinder, content); | ||
} | ||
|
||
Future<void> tapSendButton(WidgetTester tester) async { | ||
connection.prepare(json: SendMessageResult(id: 123).toJson()); | ||
await tester.tap(find.byIcon(ZulipIcons.send)); | ||
await tester.pump(Duration.zero); | ||
} | ||
|
||
group('ComposeContentController', () { | ||
group('insertPadded', () { | ||
// Like `parseMarkedText` in test/model/autocomplete_test.dart, | ||
|
@@ -196,6 +214,109 @@ void main() { | |
}); | ||
}); | ||
|
||
group('length validation', () { | ||
final channel = eg.stream(); | ||
|
||
/// String where the number of Unicode code points is [n] | ||
/// and the number of UTF-16 code units is higher. | ||
String makeStringWithCodePoints(int n) { | ||
assert(n >= 5); | ||
const graphemeCluster = '👨👩👦'; | ||
assert(graphemeCluster.runes.length == 5); | ||
assert(graphemeCluster.length == 8); | ||
assert(graphemeCluster.characters.length == 1); | ||
|
||
final result = | ||
graphemeCluster * (n ~/ 5) | ||
+ 'a' * (n % 5); | ||
assert(result.runes.length == n); | ||
|
||
return result; | ||
} | ||
|
||
group('content', () { | ||
void doTest(String description, {required String content, required bool expectError}) { | ||
testWidgets(description, (tester) async { | ||
TypingNotifier.debugEnable = false; | ||
addTearDown(TypingNotifier.debugReset); | ||
|
||
final narrow = ChannelNarrow(channel.streamId); | ||
await prepareComposeBox(tester, narrow: narrow, streams: [channel]); | ||
await enterTopic(tester, narrow: narrow, topic: 'some topic'); | ||
await enterContent(tester, narrow: narrow, content: content); | ||
|
||
await tapSendButton(tester); | ||
if (expectError) { | ||
await tester.tap(find.byWidget(checkErrorDialog(tester, | ||
expectedTitle: 'Message not sent', | ||
expectedMessage: 'Message length shouldn\'t be greater than 10000 characters.'))); | ||
} else { | ||
checkNoErrorDialog(tester); | ||
} | ||
}); | ||
} | ||
|
||
doTest('too-long content is rejected', | ||
content: makeStringWithCodePoints(kMaxMessageLengthCodePoints + 1), expectError: true); | ||
|
||
doTest('max-length content not rejected', | ||
content: makeStringWithCodePoints(kMaxMessageLengthCodePoints), expectError: false); | ||
|
||
testWidgets('code points not counted unnecessarily', (tester) async { | ||
TypingNotifier.debugEnable = false; | ||
addTearDown(TypingNotifier.debugReset); | ||
|
||
final narrow = ChannelNarrow(channel.streamId); | ||
await prepareComposeBox(tester, narrow: narrow, streams: [channel]); | ||
await enterTopic(tester, narrow: narrow, topic: 'some topic'); | ||
await enterContent(tester, narrow: narrow, content: 'a' * kMaxMessageLengthCodePoints); | ||
|
||
check(controller!.content.lengthUnicodeCodePointsIfLong).isNull(); | ||
}); | ||
}); | ||
|
||
group('topic', () { | ||
void doTest(String description, {required String topic, required bool expectError}) { | ||
testWidgets(description, (tester) async { | ||
TypingNotifier.debugEnable = false; | ||
addTearDown(TypingNotifier.debugReset); | ||
|
||
final narrow = ChannelNarrow(channel.streamId); | ||
await prepareComposeBox(tester, narrow: narrow, streams: [channel]); | ||
await enterTopic(tester, narrow: narrow, topic: topic); | ||
await enterContent(tester, narrow: narrow, content: 'some content'); | ||
|
||
await tapSendButton(tester); | ||
if (expectError) { | ||
await tester.tap(find.byWidget(checkErrorDialog(tester, | ||
expectedTitle: 'Message not sent', | ||
expectedMessage: 'Topic length shouldn\'t be greater than 60 characters.'))); | ||
} else { | ||
checkNoErrorDialog(tester); | ||
} | ||
}); | ||
} | ||
|
||
doTest('too-long topic is rejected', | ||
topic: makeStringWithCodePoints(kMaxTopicLengthCodePoints + 1), expectError: true); | ||
|
||
doTest('max-length topic not rejected', | ||
topic: makeStringWithCodePoints(kMaxTopicLengthCodePoints), expectError: false); | ||
|
||
testWidgets('code points not counted unnecessarily', (tester) async { | ||
TypingNotifier.debugEnable = false; | ||
addTearDown(TypingNotifier.debugReset); | ||
|
||
final narrow = ChannelNarrow(channel.streamId); | ||
await prepareComposeBox(tester, narrow: narrow, streams: [channel]); | ||
await enterTopic(tester, narrow: narrow, topic: 'a' * kMaxTopicLengthCodePoints); | ||
await enterContent(tester, narrow: narrow, content: 'some content'); | ||
|
||
check((controller as StreamComposeBoxController).topic.lengthUnicodeCodePointsIfLong).isNull(); | ||
}); | ||
}); | ||
}); | ||
|
||
group('ComposeBox textCapitalization', () { | ||
void checkComposeBoxTextFields(WidgetTester tester, { | ||
required bool expectTopicTextField, | ||
|
@@ -426,8 +547,7 @@ void main() { | |
await setupAndTapSend(tester, prepareResponse: (int messageId) { | ||
connection.prepare(json: SendMessageResult(id: messageId).toJson()); | ||
}); | ||
final errorDialogs = tester.widgetList(find.byType(AlertDialog)); | ||
check(errorDialogs).isEmpty(); | ||
checkNoErrorDialog(tester); | ||
}); | ||
|
||
testWidgets('ZulipApiException', (tester) async { | ||
|
@@ -496,8 +616,7 @@ void main() { | |
check(call.allowMultiple).equals(true); | ||
check(call.type).equals(FileType.media); | ||
|
||
final errorDialogs = tester.widgetList(find.byType(AlertDialog)); | ||
check(errorDialogs).isEmpty(); | ||
checkNoErrorDialog(tester); | ||
|
||
check(controller!.content.text) | ||
.equals('see image: [Uploading image.jpg…]()\n\n'); | ||
|
@@ -556,8 +675,7 @@ void main() { | |
check(call.source).equals(ImageSource.camera); | ||
check(call.requestFullMetadata).equals(false); | ||
|
||
final errorDialogs = tester.widgetList(find.byType(AlertDialog)); | ||
check(errorDialogs).isEmpty(); | ||
checkNoErrorDialog(tester); | ||
|
||
check(controller!.content.text) | ||
.equals('see image: [Uploading image.jpg…]()\n\n'); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if we maintain the length internally, and expose only a method that tests if the content is too long? We already have access to the length limit via
maxLengthUnicodeCodePoints
and hiding this cache might simplify the checks a bit.