Add single-file command to nimbus-fml file to rationalize a complex graph of FML files #5676
Conversation
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
jhugman
force-pushed
the
jhugman/exp-3520-merge-complicated-fml-into-single-file
branch
from
a1a5eeb
to
d05d669
Compare
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #5676 +/- ##
==========================================
+ Coverage 84.02% 84.07% +0.04%
==========================================
Files 106 109 +3
Lines 11272 11413 +141
==========================================
+ Hits 9471 9595 +124
- Misses 1801 1818 +17
☔ View full report in Codecov by Sentry. |
jeddai
approved these changes
Jun 23, 2023
Comment on lines
+138
to
+142
| # This will move to the generate command when deprecated commands are removed. | ||
| # - channel: | ||
| # help: The channel to generate the defaults for | ||
| # long: channel | ||
| # takes_value: true |
There was a problem hiding this comment.
Nit: Does this comment need to be here too?
| .file_stem() | ||
| .ok_or_else(|| anyhow!("Manifest file path isn't a file"))? | ||
| .to_str() | ||
| .ok_or_else(|| anyhow!("Manifest file path isn't a file with a sensible name"))?; |
Comment on lines
+939
to
+956
| #[test] | ||
| fn test_single_file_command() -> Result<()> { | ||
| test_single_merged_manifest_file("fixtures/fe/browser.yaml", "release")?; | ||
| test_single_merged_manifest_file( | ||
| "fixtures/fe/importing/including-imports/ui.fml.yaml", | ||
| "none", | ||
| )?; | ||
| test_single_merged_manifest_file( | ||
| "fixtures/fe/importing/including-imports/app.fml.yaml", | ||
| "release", | ||
| )?; | ||
| test_single_merged_manifest_file("fixtures/fe/importing/overrides/app.fml.yaml", "debug")?; | ||
| test_single_merged_manifest_file("fixtures/fe/importing/overrides/lib.fml.yaml", "debug")?; | ||
| test_single_merged_manifest_file("fixtures/fe/importing/diamond/00-app.yaml", "debug")?; | ||
| test_single_merged_manifest_file("fixtures/fe/importing/diamond/01-lib.yaml", "debug")?; | ||
| test_single_merged_manifest_file("fixtures/fe/importing/diamond/02-sublib.yaml", "debug")?; | ||
| Ok(()) | ||
| } |
| let observed = fm.default_json(); | ||
|
|
||
| // They should be the same. | ||
| assert_eq!(expected, observed); |
There was a problem hiding this comment.
Okay so to make sure I'm understanding this, this function that's used in the below test does the following?
- Load and get default json
- Generate the merged file
- Load merged and get default json
- Compare the initial file default and merged file default
jhugman
deleted the
jhugman/exp-3520-merge-complicated-fml-into-single-file
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes EXP-3520.
Pull Request checklist
[ci full]to the PR title.Branch builds: add
[firefox-android: branch-name]to the PR title.