From 249dff85c766f30dd42bd6ae840b03e113a894b8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 29 Oct 2019 16:25:37 -0400 Subject: [PATCH] FIX: Use modules for `Ember.run.debounce` hack in testing --- app/assets/javascripts/discourse-loader.js | 2 +- test/javascripts/test_helper.js | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse-loader.js b/app/assets/javascripts/discourse-loader.js index 52ad20808c3..878f16e4718 100644 --- a/app/assets/javascripts/discourse-loader.js +++ b/app/assets/javascripts/discourse-loader.js @@ -17,7 +17,7 @@ var define, requirejs; "@ember/runloop": { bind: Ember.run.bind, cancel: Ember.run.cancel, - debounce: Ember.run.debounce, + debounce: Ember.testing ? Ember.run : Ember.run.debounce, later: Ember.run.later, next: Ember.run.next, once: Ember.run.once, diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 5795795dc03..1f1f15a0d41 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -73,8 +73,7 @@ if (window.Logster) { window.Logster = { enabled: false }; } -var origDebounce = Ember.run.debounce, - pretender = require("helpers/create-pretender", null, null, false), +var pretender = require("helpers/create-pretender", null, null, false), fixtures = require("fixtures/site-fixtures", null, null, false).default, flushMap = require("discourse/models/store", null, null, false).flushMap, 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. $.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() { - Ember.run.debounce = origDebounce; window.sandbox.restore(); // Destroy any modals