From c3548aec5e3c9b77a93d09c151d099828abad8d8 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 23 Dec 2024 16:31:46 +0100 Subject: [PATCH] DEV: Don't use 0-delay for test-env discourseLater (#30442) `discourseLater` automatically uses delay of 10ms in test environment --- .../discourse/app/components/composer-editor.js | 3 +-- .../javascripts/discourse/app/components/topic-progress.js | 3 +-- .../discourse/services/chat-emoji-picker-manager.js | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/composer-editor.js b/app/assets/javascripts/discourse/app/components/composer-editor.js index 792b2a06753..b8c7995136b 100644 --- a/app/assets/javascripts/discourse/app/components/composer-editor.js +++ b/app/assets/javascripts/discourse/app/components/composer-editor.js @@ -25,7 +25,6 @@ import { import UppyComposerUpload from "discourse/lib/uppy/composer-upload"; import { formatUsername } from "discourse/lib/utilities"; import Composer from "discourse/models/composer"; -import { isTesting } from "discourse-common/config/environment"; import { tinyAvatar } from "discourse-common/lib/avatar-utils"; import { iconHTML } from "discourse-common/lib/icon-library"; import discourseLater from "discourse-common/lib/later"; @@ -809,7 +808,7 @@ export default class ComposerEditor extends Component { // need to wait a bit for the "slide down" transition of the composer discourseLater( () => this.appEvents.trigger(`${this.composerEventPrefix}:closed`), - isTesting() ? 0 : 400 + 400 ); }); diff --git a/app/assets/javascripts/discourse/app/components/topic-progress.js b/app/assets/javascripts/discourse/app/components/topic-progress.js index e78ece26a5e..2f4737fa3d1 100644 --- a/app/assets/javascripts/discourse/app/components/topic-progress.js +++ b/app/assets/javascripts/discourse/app/components/topic-progress.js @@ -3,11 +3,10 @@ import { action } from "@ember/object"; import { alias } from "@ember/object/computed"; import { scheduleOnce } from "@ember/runloop"; import { classNameBindings } from "@ember-decorators/component"; -import { isTesting } from "discourse-common/config/environment"; import discourseLater from "discourse-common/lib/later"; import discourseComputed, { bind } from "discourse-common/utils/decorators"; -const CSS_TRANSITION_DELAY = isTesting() ? 0 : 500; +const CSS_TRANSITION_DELAY = 500; @classNameBindings("docked", "withTransitions") export default class TopicProgress extends Component { diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js index 53dd6140a59..ed96d50a280 100644 --- a/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js +++ b/plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js @@ -1,15 +1,14 @@ import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { later } from "@ember/runloop"; import Service, { service } from "@ember/service"; import { Promise } from "rsvp"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { isTesting } from "discourse-common/config/environment"; import { makeArray } from "discourse-common/lib/helpers"; +import discourseLater from "discourse-common/lib/later"; import { bind } from "discourse-common/utils/decorators"; -const TRANSITION_TIME = isTesting() ? 0 : 125; // CSS transition time +const TRANSITION_TIME = 125; // CSS transition time const DEFAULT_VISIBLE_SECTIONS = ["favorites", "smileys_&_emotion"]; const DEFAULT_LAST_SECTION = "favorites"; @@ -39,7 +38,7 @@ export default class ChatEmojiPickerManager extends Service { close() { this.closing = true; - later(() => { + discourseLater(() => { if (this.isDestroyed || this.isDestroying) { return; }