IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Don't use 0-delay for test-env discourseLater (#30442)

Browse Source 
`discourseLater` automatically uses delay of 10ms in test environment
This commit is contained in:
Jarek Radosz 2024-12-23 16:31:46 +01:00 committed by GitHub
parent d0e38977e3
commit c3548aec5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/components/composer-editor.js
View File

@ -25,7 +25,6 @@ import {
import UppyComposerUpload from "discourse/lib/uppy/composer-upload"; import UppyComposerUpload from "discourse/lib/uppy/composer-upload";
import { formatUsername } from "discourse/lib/utilities"; import { formatUsername } from "discourse/lib/utilities";
import Composer from "discourse/models/composer"; import Composer from "discourse/models/composer";
import { isTesting } from "discourse-common/config/environment";
import { tinyAvatar } from "discourse-common/lib/avatar-utils"; import { tinyAvatar } from "discourse-common/lib/avatar-utils";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
import discourseLater from "discourse-common/lib/later"; 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 // need to wait a bit for the "slide down" transition of the composer
discourseLater( discourseLater(
() => this.appEvents.trigger(`${this.composerEventPrefix}:closed`), () => this.appEvents.trigger(`${this.composerEventPrefix}:closed`),
isTesting() ? 0 : 400 400
); );
}); });

3
app/assets/javascripts/discourse/app/components/topic-progress.js
View File

@ -3,11 +3,10 @@ import { action } from "@ember/object";
import { alias } from "@ember/object/computed"; import { alias } from "@ember/object/computed";
import { scheduleOnce } from "@ember/runloop"; import { scheduleOnce } from "@ember/runloop";
import { classNameBindings } from "@ember-decorators/component"; import { classNameBindings } from "@ember-decorators/component";
import { isTesting } from "discourse-common/config/environment";
import discourseLater from "discourse-common/lib/later"; import discourseLater from "discourse-common/lib/later";
import discourseComputed, { bind } from "discourse-common/utils/decorators"; import discourseComputed, { bind } from "discourse-common/utils/decorators";
const CSS_TRANSITION_DELAY = isTesting() ? 0 : 500; const CSS_TRANSITION_DELAY = 500;
@classNameBindings("docked", "withTransitions") @classNameBindings("docked", "withTransitions")
export default class TopicProgress extends Component { export default class TopicProgress extends Component {

7
plugins/chat/assets/javascripts/discourse/services/chat-emoji-picker-manager.js
View File

@ -1,15 +1,14 @@
import { tracked } from "@glimmer/tracking"; import { tracked } from "@glimmer/tracking";
import { action } from "@ember/object"; import { action } from "@ember/object";
import { later } from "@ember/runloop";
import Service, { service } from "@ember/service"; import Service, { service } from "@ember/service";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import { isTesting } from "discourse-common/config/environment";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse-common/lib/helpers";
import discourseLater from "discourse-common/lib/later";
import { bind } from "discourse-common/utils/decorators"; 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_VISIBLE_SECTIONS = ["favorites", "smileys_&_emotion"];
const DEFAULT_LAST_SECTION = "favorites"; const DEFAULT_LAST_SECTION = "favorites";
@ -39,7 +38,7 @@ export default class ChatEmojiPickerManager extends Service {
close() { close() {
this.closing = true; this.closing = true;
later(() => { discourseLater(() => {
if (this.isDestroyed || this.isDestroying) { if (this.isDestroyed || this.isDestroying) {
return; return;
} }