Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1321 from ZogStriP/i-want-my-dots-back 

don't display debug information when running tests
This commit is contained in:
Robin Ward 2013-08-13 17:28:51 -07:00
parent 4034dee3dc e90bbc6a6c
commit f517df6768
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/external/ember-renderspeed.js vendored
View File

@ -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 () {

10
app/assets/javascripts/external_development/ember.js
View File

@ -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;