Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit e84e08dfd6dd48af3fdbce5950004a042b2f9524 2 parents 3084a25 + 67ebc2b
Jan Odvarko authored March 30, 2012
1  tests/content/console/2914/issue2914-innerFrame.html
... ...
@@ -1,6 +1,7 @@
1 1
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2 2
 <html>
3 3
 <head>
  4
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4 5
   <title></title>
5 6
 </head>
6 7
 <body>
1  tests/content/console/2914/issue2914.html
... ...
@@ -1,6 +1,7 @@
1 1
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2 2
 <html>
3 3
 <head>
  4
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4 5
   <title>Test Case for Issue #2914</title>
5 6
 </head>
6 7
 <body>
4  tests/content/console/2914/issue2914.js
@@ -26,8 +26,8 @@ function runTest()
26 26
             // Verify stack trace.
27 27
             var traceNode = errorNode.querySelector(".errorTrace");
28 28
             FBTest.compare(
29  
-                "logError()" + FW.FBL.$STRF("Line", ["issue2...me.html", 10]) + 
30  
-                    "issue2914-innerFrame.html()" + FW.FBL.$STRF("Line", ["issue2...me.html", 12]),
  29
+                "logError()" + FW.FBL.$STRF("Line", ["issue2...me.html", 11]) + 
  30
+                    "issue2914-innerFrame.html()" + FW.FBL.$STRF("Line", ["issue2...me.html", 13]),
31 31
                 traceNode.textContent,
32 32
                 "The stack trace must be properly displayed.");
33 33
 
1  tests/content/console/api/assert.html
... ...
@@ -1,6 +1,7 @@
1 1
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2 2
 <html>
3 3
 <head>
  4
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4 5
   <title>Test Case for console object</title>
5 6
 </head>
6 7
 <body>
2  tests/content/console/api/assert.js
@@ -50,7 +50,7 @@ function verifyConsoleUI(config)
50 50
 
51 51
     // Verify the first assert message.
52 52
     var reExpectedLog1 = new RegExp("negative\\s*console\.assert\\(false,\\s*\"negative\"\\);\\s*" +
53  
-        FW.FBL.$STRF("Line", ["assert.html", 42]).replace(/([\\"'\(\)])/g, "\\$1"));
  53
+        FW.FBL.$STRF("Line", ["assert.html", 43]).replace(/([\\"'\(\)])/g, "\\$1"));
54 54
     if (!FBTest.compare(reExpectedLog1, rows[0].textContent,
55 55
         "The log must be something like as follows: " +
56 56
         "negative    console.assert(false, \"negative\");\r\n" + FW.FBL.$STRF("Line", ["assert.html", 42])))
3  tests/content/console/api/trace.html
... ...
@@ -1,6 +1,7 @@
1 1
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2 2
 <html>
3 3
 <head>
  4
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
4 5
   <title>Test Case for console object</title>
5 6
 </head>
6 7
 <body>
@@ -21,7 +22,7 @@
21 22
 <code style="color:blue">1 (line 2)</code></li>
22 23
 <code style="color:green">onExecuteTest()</code>
23 24
 &nbsp;&nbsp;&nbsp;&nbsp;
24  
-<code style="color:blue">trace.html (line 34)</code></li>
  25
+<code style="color:blue">trace.html (line 35)</code></li>
25 26
 
26 27
 </ol>
27 28
 
4  tests/content/console/api/trace.js
@@ -4,16 +4,18 @@ function runTest()
4 4
     FBTest.openNewTab(basePath + "console/api/trace.html", function(win)
5 5
     {
6 6
         FBTest.openFirebug();
  7
+        FBTest.enableScriptPanel();
7 8
         FBTest.enableConsolePanel(function(win)
8 9
         {
9 10
             var config = {tagName: "div", classes: "logRow logRow-stackTrace"};
10 11
             FBTest.waitForDisplayedElement("console", config, function(row)
11 12
             {
  13
+                FBTest.progress("asdfas");
12 14
                 var stackFrames = row.getElementsByClassName("objectBox-stackFrame");
13 15
                 FBTest.compare(2, stackFrames.length, "There must be 2 stack frames.");
14 16
 
15 17
                 var reStack1 = new RegExp("onExecuteTest\\(\\)\\s*" +
16  
-                    FW.FBL.$STRF("Line", ["trace.html", 34]).replace(/([\\"'\(\)])/g, "\\$1"));
  18
+                    FW.FBL.$STRF("Line", ["trace.html", 35]).replace(/([\\"'\(\)])/g, "\\$1"));
17 19
                 FBTest.compare(reStack1, stackFrames[0].textContent, "The first stack frame text must match.");
18 20
 
19 21
                 FBTest.progress("Found stack frame "+stackFrames[1].textContent);
6  tests/content/firebug/5349/issue5349.js
@@ -2,9 +2,11 @@ function runTest()
2 2
 {
3 3
     FBTest.sysout("issue5349.START");
4 4
 
5  
-    FBTest.openNewTab(basePath + "chrome/5349/issue5349.html", function(win)
  5
+    FBTest.openNewTab(basePath + "firebug/5349/issue5349.html", function(win)
6 6
     {
7  
-        FBTest.executeContextMenuCommand(win.document.getElementById("selectbox"), "menu_firebugInspect", function()
  7
+        var target = win.document.getElementById("selectbox");
  8
+        FBTest.progress("target " + target);
  9
+        FBTest.executeContextMenuCommand(target, "menu_firebugInspect", function()
8 10
         {
9 11
             FBTest.testDone("issue5349.DONE");
10 12
         });

0 notes on commit e84e08d

Please sign in to comment.
Something went wrong with that request. Please try again.