зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1371479 - Update search behavior about:newtab tests to work with activity-stream.enabled true and false. r=ursula
Update tests to select the search input for either about:newtab with a querySelector instead of specific id. Also removes gSearch checks that are always false anyway with the move to e10s contentSearch. MozReview-Commit-ID: 8knCvfzA6yk --HG-- extra : rebase_source : 484dd855dd96e587dbc1a61bf53fdad3759a7caf
This commit is contained in:
Ed Lee
Родитель
8c3bd3e2ac
Коммит
c1a3be3fdc
|
|
@ -76,8 +76,10 @@ function test() {
|
|||
function doSearch(doc) {
|
||||
// Re-add the listener, and perform a search
|
||||
gBrowser.addProgressListener(listener);
|
||||
doc.getElementById("newtab-search-text").value = "foo";
|
||||
doc.getElementById("newtab-search-submit").click();
|
||||
let input = doc.querySelector("input[id*=search-]");
|
||||
input.focus();
|
||||
input.value = "foo";
|
||||
EventUtils.synthesizeKey("VK_RETURN", {});
|
||||
}
|
||||
|
||||
// load about:newtab, but remove the listener first so it doesn't
|
||||
|
|
@ -95,20 +97,15 @@ function test() {
|
|||
|
||||
// Observe page setup
|
||||
let win = gBrowser.contentWindowAsCPOW;
|
||||
if (win.gSearch.currentEngineName ==
|
||||
Services.search.currentEngine.name) {
|
||||
doSearch(win.document);
|
||||
} else {
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(contentSearchServiceEvent) {
|
||||
info("Got newtab search event " + contentSearchServiceEvent.detail.type);
|
||||
if (contentSearchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(contentSearchServiceEvent) {
|
||||
info("Got newtab search event " + contentSearchServiceEvent.detail.type);
|
||||
if (contentSearchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,8 +76,10 @@ function test() {
|
|||
function doSearch(doc) {
|
||||
// Re-add the listener, and perform a search
|
||||
gBrowser.addProgressListener(listener);
|
||||
doc.getElementById("newtab-search-text").value = "foo";
|
||||
doc.getElementById("newtab-search-submit").click();
|
||||
let input = doc.querySelector("input[id*=search-]");
|
||||
input.focus();
|
||||
input.value = "foo";
|
||||
EventUtils.synthesizeKey("VK_RETURN", {});
|
||||
}
|
||||
|
||||
// load about:newtab, but remove the listener first so it doesn't
|
||||
|
|
@ -95,20 +97,15 @@ function test() {
|
|||
|
||||
// Observe page setup
|
||||
let win = gBrowser.contentWindowAsCPOW;
|
||||
if (win.gSearch.currentEngineName ==
|
||||
Services.search.currentEngine.name) {
|
||||
doSearch(win.document);
|
||||
} else {
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(contentSearchServiceEvent) {
|
||||
info("Got newtab search event " + contentSearchServiceEvent.detail.type);
|
||||
if (contentSearchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(contentSearchServiceEvent) {
|
||||
info("Got newtab search event " + contentSearchServiceEvent.detail.type);
|
||||
if (contentSearchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,8 +76,10 @@ function test() {
|
|||
function doSearch(doc) {
|
||||
// Re-add the listener, and perform a search
|
||||
gBrowser.addProgressListener(listener);
|
||||
doc.getElementById("newtab-search-text").value = "foo";
|
||||
doc.getElementById("newtab-search-submit").click();
|
||||
let input = doc.querySelector("input[id*=search-]");
|
||||
input.focus();
|
||||
input.value = "foo";
|
||||
EventUtils.synthesizeKey("VK_RETURN", {});
|
||||
}
|
||||
|
||||
// load about:newtab, but remove the listener first so it doesn't
|
||||
|
|
@ -95,20 +97,15 @@ function test() {
|
|||
|
||||
// Observe page setup
|
||||
let win = gBrowser.contentWindowAsCPOW;
|
||||
if (win.gSearch.currentEngineName ==
|
||||
Services.search.currentEngine.name) {
|
||||
doSearch(win.document);
|
||||
} else {
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(contentSearchServiceEvent) {
|
||||
info("Got newtab search event " + contentSearchServiceEvent.detail.type);
|
||||
if (contentSearchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(contentSearchServiceEvent) {
|
||||
info("Got newtab search event " + contentSearchServiceEvent.detail.type);
|
||||
if (contentSearchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,8 +74,10 @@ function test() {
|
|||
function doSearch(doc) {
|
||||
// Re-add the listener, and perform a search
|
||||
gBrowser.addProgressListener(listener);
|
||||
doc.getElementById("newtab-search-text").value = "foo";
|
||||
doc.getElementById("newtab-search-submit").click();
|
||||
let input = doc.querySelector("input[id*=search-]");
|
||||
input.focus();
|
||||
input.value = "foo";
|
||||
EventUtils.synthesizeKey("VK_RETURN", {});
|
||||
}
|
||||
|
||||
// load about:newtab, but remove the listener first so it doesn't
|
||||
|
|
@ -93,20 +95,15 @@ function test() {
|
|||
|
||||
// Observe page setup
|
||||
let win = gBrowser.contentWindowAsCPOW;
|
||||
if (win.gSearch.currentEngineName ==
|
||||
Services.search.currentEngine.name) {
|
||||
doSearch(win.document);
|
||||
} else {
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(searchServiceEvent) {
|
||||
info("Got newtab search event " + searchServiceEvent.detail.type);
|
||||
if (searchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(searchServiceEvent) {
|
||||
info("Got newtab search event " + searchServiceEvent.detail.type);
|
||||
if (searchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,8 +76,10 @@ function test() {
|
|||
function doSearch(doc) {
|
||||
// Re-add the listener, and perform a search
|
||||
gBrowser.addProgressListener(listener);
|
||||
doc.getElementById("newtab-search-text").value = "foo";
|
||||
doc.getElementById("newtab-search-submit").click();
|
||||
let input = doc.querySelector("input[id*=search-]");
|
||||
input.focus();
|
||||
input.value = "foo";
|
||||
EventUtils.synthesizeKey("VK_RETURN", {});
|
||||
}
|
||||
|
||||
// load about:newtab, but remove the listener first so it doesn't
|
||||
|
|
@ -95,20 +97,15 @@ function test() {
|
|||
|
||||
// Observe page setup
|
||||
let win = gBrowser.contentWindowAsCPOW;
|
||||
if (win.gSearch.currentEngineName ==
|
||||
Services.search.currentEngine.name) {
|
||||
doSearch(win.document);
|
||||
} else {
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(searchServiceEvent) {
|
||||
info("Got newtab search event " + searchServiceEvent.detail.type);
|
||||
if (searchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}
|
||||
info("Waiting for newtab search init");
|
||||
win.addEventListener("ContentSearchService", function done(searchServiceEvent) {
|
||||
info("Got newtab search event " + searchServiceEvent.detail.type);
|
||||
if (searchServiceEvent.detail.type == "State") {
|
||||
win.removeEventListener("ContentSearchService", done);
|
||||
// Let gSearch respond to the event before continuing.
|
||||
executeSoon(() => doSearch(win.document));
|
||||
}
|
||||
});
|
||||
}, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче