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: ensures click listeners are reset between tests (#13900)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2021-08-09 10:00:56 +02:00 committed by GitHub
parent 800926fcce
commit 8df48b516f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/app/mixins/card-contents-base.js
View File

@ -8,11 +8,18 @@ import headerOutletHeights from "discourse/lib/header-outlet-height";
import { inject as service } from "@ember/service"; import { inject as service } from "@ember/service";
import { wantsNewWindow } from "discourse/lib/intercept-click"; import { wantsNewWindow } from "discourse/lib/intercept-click";
let _cardClickListenerSelectors = ["#main-outlet"]; const DEFAULT_SELECTOR = "#main-outlet";
let _cardClickListenerSelectors = [DEFAULT_SELECTOR];
export function addCardClickListenerSelector(selector) { export function addCardClickListenerSelector(selector) {
_cardClickListenerSelectors.push(selector); _cardClickListenerSelectors.push(selector);
} }
export function resetCardClickListenerSelector() {
_cardClickListenerSelectors = [DEFAULT_SELECTOR];
}
export default Mixin.create({ export default Mixin.create({
router: service(), router: service(),

2
app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
View File

@ -36,6 +36,7 @@ import { resetTopicTitleDecorators } from "discourse/components/topic-title";
import { resetUsernameDecorators } from "discourse/helpers/decorate-username-selector"; import { resetUsernameDecorators } from "discourse/helpers/decorate-username-selector";
import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget"; import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget";
import { resetUserSearchCache } from "discourse/lib/user-search"; import { resetUserSearchCache } from "discourse/lib/user-search";
import { resetCardClickListenerSelector } from "discourse/mixins/card-contents-base";
import sessionFixtures from "discourse/tests/fixtures/session-fixtures"; import sessionFixtures from "discourse/tests/fixtures/session-fixtures";
import { setTopicList } from "discourse/lib/topic-list-tracker"; import { setTopicList } from "discourse/lib/topic-list-tracker";
import sinon from "sinon"; import sinon from "sinon";
@ -276,6 +277,7 @@ export function acceptance(name, optionsOrCallback) {
resetOneboxCache(); resetOneboxCache();
resetCustomPostMessageCallbacks(); resetCustomPostMessageCallbacks();
resetUserSearchCache(); resetUserSearchCache();
resetCardClickListenerSelector();
resetPostMenuExtraButtons(); resetPostMenuExtraButtons();
clearNavItems(); clearNavItems();
setTopicList(null); setTopicList(null);