Bug 1408870 - Enable browser_jsterm_history_persist.js on the new console frontend; r=bgrins.

Cleaning jsterm history from previous test so it does not interfere with this one.
Also clearing history at the beginning of the test so we are future-proof.

MozReview-Commit-ID: 33OCfaSiskw

--HG--
extra : rebase_source : 4af9df28f45455c341c11f4c8f87e4d735d52d30
This commit is contained in:
Nicolas Chevobbe 2017-10-16 18:18:32 +02:00
parent 3c160750e2
commit 695f76a1ae
3 changed files with 18 additions and 20 deletions

View File

@ -201,7 +201,6 @@ subsuite = clipboard
# old console skip-if = (os == 'linux' && bits == 32 && debug) # bug 1328915, disable linux32 debug devtools for timeouts
[browser_jsterm_dollar.js]
[browser_jsterm_history_persist.js]
skip-if = true # Bug 1408870
[browser_jsterm_inspect.js]
[browser_jsterm_no_autocompletion_on_defined_variables.js]
skip-if = true # Bug 1408872

View File

@ -15,6 +15,9 @@ add_task(function* () {
let hud = yield openNewTabAndConsole(TEST_URI);
yield test$(hud);
yield test$$(hud);
// Clear history to not affect next tests.
yield hud.jsterm.clearHistory();
});
async function test$(hud) {

View File

@ -16,15 +16,16 @@ const INPUT_HISTORY_COUNT = 10;
add_task(function* () {
info("Setting custom input history pref to " + INPUT_HISTORY_COUNT);
Services.prefs.setIntPref("devtools.webconsole.inputHistoryCount",
INPUT_HISTORY_COUNT);
Services.prefs.setIntPref("devtools.webconsole.inputHistoryCount", INPUT_HISTORY_COUNT);
// First tab: run a bunch of commands and then make sure that you can
// navigate through their history.
yield loadTab(TEST_URI);
let hud1 = yield openConsole();
is(JSON.stringify(hud1.jsterm.history), "[]",
"No history on first tab initially");
let hud1 = yield openNewTabAndConsole(TEST_URI);
// Clearing history that might have been set in previous tests.
yield hud1.jsterm.clearHistory();
is(JSON.stringify(hud1.jsterm.history), "[]", "No history on first tab initially");
yield populateInputHistory(hud1);
is(JSON.stringify(hud1.jsterm.history),
'["0","1","2","3","4","5","6","7","8","9"]',
@ -32,20 +33,18 @@ add_task(function* () {
// Second tab: Just make sure that you can navigate through the history
// generated by the first tab.
yield loadTab(TEST_URI);
let hud2 = yield openConsole();
let hud2 = yield openNewTabAndConsole(TEST_URI);
is(JSON.stringify(hud2.jsterm.history),
'["0","1","2","3","4","5","6","7","8","9"]',
"Second tab has populated history");
yield testNaviatingHistoryInUI(hud2);
yield testNavigatingHistoryInUI(hud2);
is(JSON.stringify(hud2.jsterm.history),
'["0","1","2","3","4","5","6","7","8","9",""]',
"An empty entry has been added in the second tab due to history perusal");
// Third tab: Should have the same history as first tab, but if we run a
// command, then the history of the first and second shouldn't be affected
yield loadTab(TEST_URI);
let hud3 = yield openConsole();
let hud3 = yield openNewTabAndConsole(TEST_URI);
is(JSON.stringify(hud3.jsterm.history),
'["0","1","2","3","4","5","6","7","8","9"]',
"Third tab has populated history");
@ -68,18 +67,15 @@ add_task(function* () {
// Fourth tab: Should have the latest command from the third tab, followed
// by the rest of the history from the first tab.
yield loadTab(TEST_URI);
let hud4 = yield openConsole();
let hud4 = yield openNewTabAndConsole(TEST_URI);
is(JSON.stringify(hud4.jsterm.history),
'["1","2","3","4","5","6","7","8","9","\\"hello from third tab\\""]',
"Fourth tab has most recent history");
yield hud4.jsterm.clearHistory();
is(JSON.stringify(hud4.jsterm.history), "[]",
"Clearing history for a tab works");
is(JSON.stringify(hud4.jsterm.history), "[]", "Clearing history for a tab works");
yield loadTab(TEST_URI);
let hud5 = yield openConsole();
let hud5 = yield openNewTabAndConsole(TEST_URI);
is(JSON.stringify(hud5.jsterm.history), "[]",
"Clearing history carries over to a new tab");
@ -98,7 +94,7 @@ function* populateInputHistory(hud) {
// Set input value separately from execute so UP arrow accurately navigates
// history.
jsterm.setInputValue(i);
jsterm.execute();
yield jsterm.execute();
}
}
@ -106,7 +102,7 @@ function* populateInputHistory(hud) {
* Check pressing up results in history traversal like:
* [9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
*/
function* testNaviatingHistoryInUI(hud) {
function testNavigatingHistoryInUI(hud) {
let jsterm = hud.jsterm;
jsterm.focus();