Skip to content

clean up --dart-define-from-file option tests #135980

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.

Sign up for GitHub

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

Jump to bottom
Merged
auto-submit merged 7 commits into from
Oct 17, 2023
Merged

clean up --dart-define-from-file option tests #135980

auto-submit merged 7 commits into from
Oct 17, 2023

Conversation

@andrewkolos
Copy link
Contributor

@andrewkolos andrewkolos commented Oct 4, 2023 •
edited
Loading

Fixes #134279.

Changes:

  • Moves all tests of --dart-define-from-file behavior from build_bundle_test.dart and assemble_test.dart to flutter_command_test.dart.
  • Deletes a duplicate test of malformed JSON detection behavior.
  • Renames the useDartDefineFromFileOption method of FlutterCommand to _usesDartDefineFromFileOption. This 1) makes the name more consistent with the other uses*Option methods and 2) hides the method since it is not used outside of the file.
  • Renames several tests to better articulate what is under test and what the expected result is.
  • Adds a test for the case where a .env file with a malformed line is provided to --dart-define-from-file.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@andrewkolos andrewkolos added the tool Affects the "flutter" command-line tool. See also t: labels. label Oct 4, 2023
@andrewkolos andrewkolos marked this pull request as ready for review October 5, 2023 19:23
christopherfujino
christopherfujino reviewed Oct 11, 2023
View reviewed changes
packages/flutter_tools/lib/src/runner/flutter_command.dart Outdated
Copy link
Contributor

@christopherfujino christopherfujino Oct 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason not to ask the user to fix the file? I'm thinking they may see this and think it's an internal error and file a bug.

Copy link
Contributor Author

@andrewkolos andrewkolos Oct 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The details of the FormatException would hopefully lead users to figure out what needs to be fixed, but I think making a more explicit call to action is a good idea. Updated to this:

https://github.com/flutter/flutter/blob/59c709ff94e071df91b1d25ad63703f226045743/packages/flutter_tools/lib/src/runner/flutter_command.dart#L1426-L1429

christopherfujino
christopherfujino approved these changes Oct 11, 2023
View reviewed changes
Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewkolos andrewkolos added the autosubmit Merge PR when tree becomes green via auto submit App label Oct 11, 2023
@andrewkolos andrewkolos force-pushed the cleanup-dart-defines-from-file-tests branch from 59c709f to 4005944 Compare October 17, 2023 21:05
@auto-submit auto-submit bot merged commit cdc40b5 into flutter:master Oct 17, 2023
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 18, 2023
@engine-flutter-autoroll
cdc40b5 clean up --dart-define-from-file option tests (flutter/flut…
6f45758 
…ter#135980)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 18, 2023
@engine-flutter-autoroll
cdc40b5 clean up --dart-define-from-file option tests (flutter/flut…
e412e87 
…ter#135980)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 18, 2023
@engine-flutter-autoroll
cdc40b5 clean up --dart-define-from-file option tests (flutter/flut…
d490083 
…ter#135980)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 18, 2023
@engine-flutter-autoroll
cdc40b5 clean up --dart-define-from-file option tests (flutter/flut…
38fad47 
…ter#135980)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 18, 2023
@engine-flutter-autoroll
cdc40b5 clean up --dart-define-from-file option tests (flutter/flut…
25c6f97 
…ter#135980)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 18, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 18, 2023
@engine-flutter-autoroll
cdc40b5 clean up --dart-define-from-file option tests (flutter/flut…
33b851e 
…ter#135980)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 18, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Oct 18, 2023
@engine-flutter-autoroll
cdc40b5 clean up --dart-define-from-file option tests (flutter/flut…
329e959 
…ter#135980)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Oct 19, 2023
@engine-flutter-autoroll
Manual roll Flutter from 6eea6e2 to 189196d (44 revisions) (#5178)
09c6b11 
Manual roll Flutter from 6eea6e2 to 189196d (44 revisions)

Manual roll requested by [email protected]

flutter/flutter@6eea6e2...189196d

2023-10-18 [email protected] Roll Flutter Engine from ab86c53c19cd to 6caee3236d37 (2 revisions) (flutter/flutter#136834)
2023-10-18 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[Reland] Skip injecting Bonjour settings when port publication is disabled" (flutter/flutter#136839)
2023-10-18 [email protected] Convert menus to use OverlayPortal (flutter/flutter#130534)
2023-10-18 [email protected] [Reland] Skip injecting Bonjour settings when port publication is disabled (flutter/flutter#136751)
2023-10-18 [email protected] Roll Flutter Engine from 0eff5d191856 to ab86c53c19cd (1 revision) (flutter/flutter#136832)
2023-10-18 [email protected] Fixes ability to call nextFocus() on a node to focus its descendant (flutter/flutter#136773)
2023-10-18 [email protected] Roll Flutter Engine from b778a07f8ae9 to 0eff5d191856 (6 revisions) (flutter/flutter#136829)
2023-10-18 [email protected] Implement GApplication:shutdown so a Flutter developer knows where to put code that should occur on application shutdown. (flutter/flutter#136780)
2023-10-18 [email protected] Roll Flutter Engine from 7f37c9b181af to b778a07f8ae9 (1 revision) (flutter/flutter#136818)
2023-10-18 [email protected] Fix `Slider` `onChanged` callback order & never calls `onChangeStart` on  `SliderInteraction.slideOnly` allowed interaction (flutter/flutter#136720)
2023-10-18 [email protected] Roll Flutter Engine from 78026b4003fe to 7f37c9b181af (1 revision) (flutter/flutter#136817)
2023-10-18 [email protected] [Feat] Stroke color for Slider value indicator (flutter/flutter#135986)
2023-10-18 [email protected] Fixed : Empty Rows shown at last page in Paginated data table (flutter/flutter#132646)
2023-10-18 [email protected] Roll Flutter Engine from 46923fd39032 to 78026b4003fe (1 revision) (flutter/flutter#136814)
2023-10-18 [email protected] Roll Packages from d439062 to 14aa69e (1 revision) (flutter/flutter#136813)
2023-10-18 [email protected] Don't build native assets in `flutter build bundle` (flutter/flutter#136641)
2023-10-18 [email protected] Roll Flutter Engine from c9c9684e03a3 to 46923fd39032 (1 revision) (flutter/flutter#136795)
2023-10-18 [email protected] Roll Flutter Engine from 0c1c29271e8b to c9c9684e03a3 (1 revision) (flutter/flutter#136792)
2023-10-18 [email protected] Roll Flutter Engine from 1de09d13e708 to 0c1c29271e8b (3 revisions) (flutter/flutter#136789)
2023-10-18 [email protected] Roll Flutter Engine from 6fc36e61a99a to 1de09d13e708 (1 revision) (flutter/flutter#136785)
2023-10-18 [email protected] Roll Flutter Engine from 3f818efff3c5 to 6fc36e61a99a (1 revision) (flutter/flutter#136781)
2023-10-18 [email protected] Roll Flutter Engine from 2eef9b43cfb4 to 3f818efff3c5 (3 revisions) (flutter/flutter#136777)
2023-10-18 [email protected] Roll Flutter Engine from 5df7af34a718 to 2eef9b43cfb4 (4 revisions) (flutter/flutter#136774)
2023-10-18 [email protected] Flutter preview device (flutter/flutter#135639)
2023-10-18 [email protected] Add findChildIndexCallback examples (flutter/flutter#133469)
2023-10-18 [email protected] Adds API for performing semantics actions in tests (flutter/flutter#132598)
2023-10-18 [email protected] Roll Flutter Engine from e57b5bac4244 to 5df7af34a718 (2 revisions) (flutter/flutter#136772)
2023-10-17 [email protected] Roll Flutter Engine from f9f937e51080 to e57b5bac4244 (3 revisions) (flutter/flutter#136768)
2023-10-17 [email protected] clean up `--dart-define-from-file` option tests (flutter/flutter#135980)
2023-10-17 [email protected] GoldenFileComparators should dispose created Image objects.  (flutter/flutter#136716)
2023-10-17 [email protected] make integration_test_driver_extended.dart support writeResponseData--(done) (flutter/flutter#128382)
2023-10-17 49699333+dependabot[bot]@users.noreply.github.com Bump actions/checkout from 3.6.0 to 4.1.1 (flutter/flutter#136762)
2023-10-17 [email protected] Roll Flutter Engine from 289f29b1ad00 to f9f937e51080 (1 revision) (flutter/flutter#136755)
2023-10-17 [email protected] Roll Flutter Engine from 659e68a097b5 to 289f29b1ad00 (1 revision) (flutter/flutter#136752)
2023-10-17 [email protected] Support --web-header option for flutter run (flutter/flutter#136297)
2023-10-17 [email protected] Add Android 14 physical devices to firebase tests (flutter/flutter#136736)
2023-10-17 [email protected] Roll Flutter Engine from 62a90a91cee3 to 659e68a097b5 (3 revisions) (flutter/flutter#136746)
2023-10-17 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Skip injecting Bonjour settings when port publication is disabled" (flutter/flutter#136750)
2023-10-17 [email protected] Revert "[SingleChildScrollView] Correct the offset pixels if it is out of range during layout" (flutter/flutter#136744)
2023-10-17 [email protected] Skip injecting Bonjour settings when port publication is disabled (flutter/flutter#136562)
2023-10-17 [email protected] Roll Flutter Engine from 3ecbe924a598 to 62a90a91cee3 (2 revisions) (flutter/flutter#136739)
2023-10-17 [email protected] Roll Flutter Engine from 0a4d8b99a95b to 3ecbe924a598 (3 revisions) (flutter/flutter#136732)
2023-10-17 [email protected] Reenable NexusLowRes API 29 (flutter/flutter#136686)
2023-10-17 [email protected] Reenable the nexus 6p tests (flutter/flutter#136689)
...
@andrewkolos andrewkolos deleted the cleanup-dart-defines-from-file-tests branch April 29, 2024 18:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@christopherfujino christopherfujino christopherfujino approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

--dart-define-from-file tests are spread across two unrelated files

2 participants

@andrewkolos @christopherfujino