From e90bbc6a6c45a7df3cd876f1f6a47fdbac4d939f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 14 Aug 2013 00:12:25 +0200
Subject: [PATCH] don't display debug information when running tests

---
 app/assets/javascripts/external/ember-renderspeed.js |  2 +-
 app/assets/javascripts/external_development/ember.js | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/external/ember-renderspeed.js b/app/assets/javascripts/external/ember-renderspeed.js
index 17312ee8272..c7089c007be 100644
--- a/app/assets/javascripts/external/ember-renderspeed.js
+++ b/app/assets/javascripts/external/ember-renderspeed.js
@@ -6,7 +6,7 @@
 //
 //  https://github.com/eviltrout/ember-renderspeed
 //
-if ((typeof console !== 'undefined') && console.groupCollapsed) {
+if ((typeof console !== 'undefined') && console.groupCollapsed && !window.QUnit) {
 
   (function () {
 
diff --git a/app/assets/javascripts/external_development/ember.js b/app/assets/javascripts/external_development/ember.js
index 67f33ab419d..8f571c2af7b 100755
--- a/app/assets/javascripts/external_development/ember.js
+++ b/app/assets/javascripts/external_development/ember.js
@@ -4864,10 +4864,12 @@ define("backburner",
           }
         }
 
-        var diff = new Date().getTime() - t2;
-
-        if ((typeof console !== 'undefined') && console.log && diff > 10) {
-          console.log("Backburner: " + (new Date() - t2) + "ms");
+        // make sure we can output to the console and we're not running QUnit tests
+        if ((typeof console !== 'undefined') && console.log && !window.QUnit) {
+          var diff = new Date().getTime() - t2;
+          if (diff > 10) {
+            console.log("Backburner: " + (new Date() - t2) + "ms");
+          }
         }
 
         return ret;