From d77951dc33bd4e2f51f4f35b460c5b93dabca5dc Mon Sep 17 00:00:00 2001 From: Erik Vold Date: Wed, 14 Aug 2013 10:57:38 -0700 Subject: [PATCH] Bug 689291 test-tabs.test window focus changes active tab | Test output exceeded timeout (60s). r=Mossop --- .../source/test/tabs/test-firefox-tabs.js | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/addon-sdk/source/test/tabs/test-firefox-tabs.js b/addon-sdk/source/test/tabs/test-firefox-tabs.js index 9a56d7e7362077..0798046b7a2a1a 100644 --- a/addon-sdk/source/test/tabs/test-firefox-tabs.js +++ b/addon-sdk/source/test/tabs/test-firefox-tabs.js @@ -834,18 +834,29 @@ exports.testAttachUnwrapped = function (test) { exports['test window focus changes active tab'] = function(test) { test.waitUntilDone(); + + let url1 = "data:text/html;charset=utf-8," + encodeURIComponent("test window focus changes active tab

Window #1"); + let win1 = openBrowserWindow(function() { + test.pass("window 1 is open"); + let win2 = openBrowserWindow(function() { - tabs.on("activate", function onActivate() { + test.pass("window 2 is open"); + + tabs.on("activate", function onActivate(tab) { tabs.removeListener("activate", onActivate); test.pass("activate was called on windows focus change."); - closeBrowserWindow(win1, function() { - closeBrowserWindow(win2, function() { test.done(); }); - }); + test.assertEqual(tab.url, url1, 'the activated tab url is correct'); + + close(win2).then(function() { + test.pass('window 2 was closed'); + return close(win1); + }).then(test.done.bind(test)); }); + win1.focus(); }, "data:text/html;charset=utf-8,test window focus changes active tab

Window #2"); - }, "data:text/html;charset=utf-8,test window focus changes active tab

Window #1"); + }, url1); }; exports['test ready event on new window tab'] = function(test) {