Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 438599 - the currentEngine attribute of nsIBrowserSearchService should never be null, r=Mossop.

Browse Source
This commit is contained in:
Florian Quèze 2015-09-04 11:39:08 +02:00
parent 96852f533f
commit 2d82cfc143
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/search/nsSearchService.js
View File

@ -4916,6 +4916,14 @@ SearchService.prototype = {
this._currentEngine = this._originalDefaultEngine;
if (!this._currentEngine || this._currentEngine.hidden)
this._currentEngine = this._getSortedEngines(false)[0];
if (!this._currentEngine) {
// Last resort fallback: unhide the original default engine.
this._currentEngine = this._originalDefaultEngine;
if (this._currentEngine)
this._currentEngine.hidden = false;
}
return this._currentEngine;
},

25
toolkit/components/search/tests/xpcshell/test_currentEngine_fallback.js Normal file
View File

@ -0,0 +1,25 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
function run_test() {
do_check_true(Services.search.getVisibleEngines().length > 1);
do_check_true(Services.search.isInitialized);
// Remove the current engine...
let currentEngine = Services.search.currentEngine;
Services.search.removeEngine(currentEngine);
// ... and verify a new current engine has been set.
do_check_neq(Services.search.currentEngine.name, currentEngine.name);
do_check_true(currentEngine.hidden);
// Remove all the other engines.
Services.search.getVisibleEngines().forEach(Services.search.removeEngine);
do_check_eq(Services.search.getVisibleEngines().length, 0);
// Verify the original default engine is used as a fallback and no
// longer hidden.
do_check_eq(Services.search.currentEngine.name, currentEngine.name);
do_check_false(currentEngine.hidden);
do_check_eq(Services.search.getVisibleEngines().length, 1);
}

1
toolkit/components/search/tests/xpcshell/xpcshell.ini
View File

@ -82,3 +82,4 @@ tags = addons
[test_selectedEngine.js]
[test_geodefaults.js]
[test_hidden.js]
[test_currentEngine_fallback.js]