diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-02 08:33:42 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-02 08:33:42 +0530 |
| commit | ea24389b85980e7099036abe33dc4837c191d141 (patch) | |
| tree | 8e050a389ec87c768ea8c87e4e1796e9116849e4 /components/script/webdriver_handlers.rs | |
| parent | 5bb38aa03b5b83dadfa675591dd8bd5cfb31a7f0 (diff) | |
| parent | 324b4d1e6db1a5e76c3702d8b39d7c8789ae9311 (diff) | |
| download | servo-ea24389b85980e7099036abe33dc4837c191d141.tar.gz servo-ea24389b85980e7099036abe33dc4837c191d141.zip | |
Auto merge of #10114 - matthewbentley:master, r=Manishearth
Load prefs.json from profile-dir if --profile-dir is specified at launch
In response to #10098
Tries to load `prefs.json` from the profile-dir and merge them into the preferences if `--profile-dir` is specified at launch. The profile-dir preferences take precedence over the default preferences, but command line preferences still take precedence over everything.
Also adds some tests for `prefs.rs`. These rely on the contents of `resources/prefs.json` (at least `test_get_set_reset_extend()` does), so they may need to be re-worked a bit.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10114)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/webdriver_handlers.rs')
0 files changed, 0 insertions, 0 deletions