Permalink
Browse files

Merge branch 'master' of github.com:firebug/firebug

  • Loading branch information...
janodvarko committed Jan 3, 2013
2 parents af743d9 + 141bcd6 commit 7be3c233e336bc7ae31cd7aae6794dfccf86b895
Showing with 12 additions and 5 deletions.
  1. +2 −2 tests/FBTest/content/FBTestFirebug.js
  2. +10 −3 tests/content/commandLine/5873/issue5873.js
@@ -795,12 +795,12 @@ function waitForWindowLoad(browser, callback)
// (bug549539) could be utilized.
function waitForEvents(event)
{
- if (event.type == "load")
+ if (event.type == "load" && event.target === browser.contentDocument)
{
browser.removeEventListener("load", waitForEvents, true);
loaded = true;
}
- else if (event.type == "MozAfterPaint")
+ else if (event.type == "MozAfterPaint" && event.target === browser.contentWindow)
{
browser.removeEventListener("MozAfterPaint", waitForEvents, true);
painted = true;
@@ -62,8 +62,17 @@ function runTest()
}
var src = (createA + "").replace(/\n/g,' ').replace(/ +/g, ' ');
src += " createA();";
+ var sync = false;
FW.Firebug.CommandLine.evaluate(src, FW.Firebug.currentContext, undefined,
- undefined, function() {}, function() {});
+ undefined, function()
+ {
+ sync = true;
+ }, function(e)
+ {
+ sync = true;
+ FBTest.compare(1, 0, "evaluation error: " + e);
+ });
+ FBTest.compare(true, sync, "Evaluation must be syncronous.");
callback();
}
@@ -86,8 +95,6 @@ function runTest()
}).join(",");
var wanted = "catched,helper,local,param,unused,withVar";
FBTest.compare(wanted, joined, "The completion popup should show the right list of closure variables.");
- if (wanted !== joined)
- FBTest.progress("Actual: " + joined);
cmdLine.value = "";
FBTest.setPref("commandLineShowCompleterPopup", false);
callback();

0 comments on commit 7be3c23

Please sign in to comment.