diff --git a/app/assets/javascripts/discourse/app/components/topic-progress.js b/app/assets/javascripts/discourse/app/components/topic-progress.js index ee5df9843d9..b9bdad9ad59 100644 --- a/app/assets/javascripts/discourse/app/components/topic-progress.js +++ b/app/assets/javascripts/discourse/app/components/topic-progress.js @@ -3,6 +3,9 @@ import Component from "@ember/component"; import { alias } from "@ember/object/computed"; import { later, scheduleOnce } from "@ember/runloop"; import { action } from "@ember/object"; +import { isTesting } from "discourse-common/config/environment"; + +const CSS_TRANSITION_DELAY = isTesting() ? 0 : 500; export default Component.extend({ elementId: "topic-progress-wrapper", @@ -74,7 +77,7 @@ export default Component.extend({ // start CSS transitions a tiny bit later // to avoid jumpiness on initial topic load - later(this._addCssTransitions, 500); + later(this._addCssTransitions, CSS_TRANSITION_DELAY); }, willDestroyElement() { diff --git a/app/assets/javascripts/discourse/app/mixins/docking.js b/app/assets/javascripts/discourse/app/mixins/docking.js index f770568c5fb..ad1b84d2c68 100644 --- a/app/assets/javascripts/discourse/app/mixins/docking.js +++ b/app/assets/javascripts/discourse/app/mixins/docking.js @@ -1,6 +1,10 @@ import Mixin from "@ember/object/mixin"; import discourseDebounce from "discourse-common/lib/debounce"; import { cancel, later } from "@ember/runloop"; +import { isTesting } from "discourse-common/config/environment"; + +const INITIAL_DELAY_MS = isTesting() ? 0 : 50; +const DEBOUNCE_MS = isTesting() ? 0 : 5; export default Mixin.create({ queueDockCheck: null, @@ -10,7 +14,11 @@ export default Mixin.create({ init() { this._super(...arguments); this.queueDockCheck = () => { - this._queuedTimer = discourseDebounce(this, this.safeDockCheck, 5); + this._queuedTimer = discourseDebounce( + this, + this.safeDockCheck, + DEBOUNCE_MS + ); }; }, @@ -30,7 +38,7 @@ export default Mixin.create({ }); // dockCheck might happen too early on full page refresh - this._initialTimer = later(this, this.safeDockCheck, 50); + this._initialTimer = later(this, this.safeDockCheck, INITIAL_DELAY_MS); }, willDestroyElement() { diff --git a/app/assets/javascripts/discourse/app/routes/topic.js b/app/assets/javascripts/discourse/app/routes/topic.js index a7c4b6a3fb7..d0bfaa7d840 100644 --- a/app/assets/javascripts/discourse/app/routes/topic.js +++ b/app/assets/javascripts/discourse/app/routes/topic.js @@ -7,8 +7,9 @@ import { isEmpty } from "@ember/utils"; import { inject as service } from "@ember/service"; import { setTopicId } from "discourse/lib/topic-list-tracker"; import showModal from "discourse/lib/show-modal"; +import { isTesting } from "discourse-common/config/environment"; -const SCROLL_DELAY = 500; +const SCROLL_DELAY = isTesting() ? 0 : 500; const TopicRoute = DiscourseRoute.extend({ screenTrack: service(), @@ -230,7 +231,7 @@ const TopicRoute = DiscourseRoute.extend({ this, "_replaceUnlessScrolling", postUrl, - Ember.Test ? 0 : SCROLL_DELAY + SCROLL_DELAY ), }); }