github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 19:54:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Use modules for Ember.run.debounce hack in testing

Browse Source
This commit is contained in:
Robin Ward
2019-10-29 16:25:37 -04:00
parent e5525d03b8
commit 249dff85c7
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse-loader.js
View File

@ -17,7 +17,7 @@ var define, requirejs;
"@ember/runloop": { "@ember/runloop": {
bind: Ember.run.bind, bind: Ember.run.bind,
cancel: Ember.run.cancel, cancel: Ember.run.cancel,
debounce: Ember.run.debounce, debounce: Ember.testing ? Ember.run : Ember.run.debounce,
later: Ember.run.later, later: Ember.run.later,
next: Ember.run.next, next: Ember.run.next,
once: Ember.run.once, once: Ember.run.once,

9
test/javascripts/test_helper.js
View File

@ -73,8 +73,7 @@ if (window.Logster) {
window.Logster = { enabled: false }; window.Logster = { enabled: false };
} }
var origDebounce = Ember.run.debounce, var pretender = require("helpers/create-pretender", null, null, false),
pretender = require("helpers/create-pretender", null, null, false),
fixtures = require("fixtures/site-fixtures", null, null, false).default, fixtures = require("fixtures/site-fixtures", null, null, false).default,
flushMap = require("discourse/models/store", null, null, false).flushMap, flushMap = require("discourse/models/store", null, null, false).flushMap,
ScrollingDOMMethods = require("discourse/mixins/scrolling", null, null, false) ScrollingDOMMethods = require("discourse/mixins/scrolling", null, null, false)
@ -137,15 +136,9 @@ QUnit.testStart(function(ctx) {
// Unless we ever need to test this, let's leave it off. // Unless we ever need to test this, let's leave it off.
$.fn.autocomplete = function() {}; $.fn.autocomplete = function() {};
// Don't debounce in test unless we're testing debouncing
if (ctx.module.indexOf("debounce") === -1) {
Ember.run.debounce = Ember.run;
}
}); });
QUnit.testDone(function() { QUnit.testDone(function() {
Ember.run.debounce = origDebounce;
window.sandbox.restore(); window.sandbox.restore();
// Destroy any modals // Destroy any modals