Fixed wrong mode detection for Chrome 27 stack when running test in Opera browser

victor-homyakov · victor-homyakov · commit d25b42e00543 · 2013-08-01T12:54:13.000+03:00
diff --git a/stacktrace.js b/stacktrace.js
@@ -72,20 +72,21 @@
                 return 'safari';
             } else if (e.stack && e.number) {
                 return 'ie';
-            } else if (typeof e.message === 'string' && typeof window !== 'undefined' && window.opera) {
-                // e.message.indexOf("Backtrace:") > -1 -> opera
-                // !e.stacktrace -> opera
+            } else if (e.stack && e.fileName) {
+                return 'firefox';
+            } else if (e.message && e['opera#sourceloc']) {
+                // e.message.indexOf("Backtrace:") > -1 -> opera9
+                // 'opera#sourceloc' in e -> opera9, opera10a
+                // !e.stacktrace -> opera9
                 if (!e.stacktrace) {
                     return 'opera9'; // use e.message
                 }
-                // 'opera#sourceloc' in e -> opera9, opera10a
                 if (e.message.indexOf('\n') > -1 && e.message.split('\n').length > e.stacktrace.split('\n').length) {
+                    // e.message may have more stack entries than e.stacktrace
                     return 'opera9'; // use e.message
                 }
-                // e.stacktrace && !e.stack -> opera10a
-                if (!e.stack) {
-                    return 'opera10a'; // use e.stacktrace
-                }
+                return 'opera10a'; // use e.stacktrace
+            } else if (e.message && e.stack && e.stacktrace) {
                 // e.stacktrace && e.stack -> opera10b
                 if (e.stacktrace.indexOf("called from line") < 0) {
                     return 'opera10b'; // use e.stacktrace, format differs from 'opera10a'
@@ -96,8 +97,6 @@
                 // Chrome 27 does not have e.arguments as earlier versions,
                 // but still does not have e.fileName as Firefox
                 return 'chrome';
-            } else if (e.stack) {
-                return 'firefox';
             }
             return 'other';
         },
diff --git a/test/TestStacktrace.js b/test/TestStacktrace.js
@@ -153,16 +153,13 @@
     });
 
     test("run opera9", function() {
-        expect(5);
+        expect(4);
         var p = impl();
         UnitTest.fn.createModeStubs(p);
         p.opera9 = function() {
             ok(true, 'called run() for "opera9"');
         };
         UnitTest.fn.prepareFakeOperaEnvironment();
-        p.run({
-            message: 'ignored\n' + 'ignored\n' + 'ignored\n' + 'ignored\n' + 'Line 40 of linked script http://site.com: in function f1\n' + '      discarded()\n' + 'Line 44 of linked script http://site.com\n' + '     f1(1, "abc")\n' + 'ignored\n' + 'ignored'
-        });
         p.run(CapturedExceptions.opera_854);
         p.run(CapturedExceptions.opera_902);
         p.run(CapturedExceptions.opera_927);
