From 993ed10cf0022061e41955ba7395eab578736928 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 9 Aug 2023 18:20:43 +0200
Subject: [PATCH] DEV: Don't stub `logout` function (#23039)

---
 app/assets/javascripts/discourse/app/lib/logout.js           | 5 +++++
 .../javascripts/discourse/tests/acceptance/user-test.js      | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/lib/logout.js b/app/assets/javascripts/discourse/app/lib/logout.js
index a2018e4ce45..4d0ae77c0da 100644
--- a/app/assets/javascripts/discourse/app/lib/logout.js
+++ b/app/assets/javascripts/discourse/app/lib/logout.js
@@ -1,8 +1,13 @@
 import getURL from "discourse-common/lib/get-url";
 import { helperContext } from "discourse-common/lib/helpers";
 import { isEmpty } from "@ember/utils";
+import { isTesting } from "discourse-common/config/environment";
 
 export default function logout({ redirect } = {}) {
+  if (isTesting()) {
+    return;
+  }
+
   const ctx = helperContext();
   let keyValueStore = ctx.keyValueStore;
   keyValueStore.abandonLocal();
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
index 784883f7c65..e340ac81691 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/user-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/user-test.js
@@ -1,7 +1,6 @@
 import I18n from "I18n";
 import EmberObject from "@ember/object";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import sinon from "sinon";
 import userFixtures from "discourse/tests/fixtures/user-fixtures";
 import {
   acceptance,
@@ -11,7 +10,6 @@ import {
   queryAll,
   updateCurrentUser,
 } from "discourse/tests/helpers/qunit-helpers";
-import * as logout from "discourse/lib/logout";
 import { click, currentRouteName, visit } from "@ember/test-helpers";
 import { cloneJSON } from "discourse-common/lib/object";
 import { test } from "qunit";
@@ -363,7 +361,6 @@ acceptance("User - Logout", function (needs) {
   needs.user({ username: "eviltrout" });
 
   test("Dialog works", async function (assert) {
-    sinon.stub(logout, "default");
     await visit("/u/eviltrout");
     await publishToMessageBus("/logout/19");
 
@@ -379,6 +376,5 @@ acceptance("User - Logout", function (needs) {
     );
 
     await click(".dialog-overlay");
-    assert.ok(logout.default.called, "logout helper was called");
   });
 });