update test

discourse · nattsw · Aug 5, 2025 · Aug 4, 2025 · Aug 4, 2025 · Aug 4, 2025
commit dbc4f617b2ecad15ff3a408a0613679e94af94a8
diff --git a/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js b/app/assets/javascripts/discourse/tests/acceptance/user-menu-test.js
@@ -357,8 +357,8 @@ acceptance("User menu", function (needs) {
     withPluginApi((api) => {
       api.registerModelTransformer("bookmark", (bookmarks) => {
         bookmarks.forEach((bookmark) => {
-          if (bookmark.title) {
-            bookmark.title = `pluginBookmarkTransformer ${bookmark.title}`;
+          if (bookmark.fancy_title) {
+            bookmark.fancy_title = `pluginBookmarkTransformer ${bookmark.fancy_title}`;
           }
         });
       });

diff --git a/app/serializers/concerns/localized_fancy_topic_title_mixin.rb b/app/serializers/concerns/localized_fancy_topic_title_mixin.rb
@@ -22,8 +22,8 @@ def include_fancy_title?
   private
 
   def _topic
-    return topic if defined?(topic) && topic.class == Topic
     return object if object.class == Topic
+    return topic if defined?(topic) && topic.class == Topic
     object.topic if defined?(object.topic) && object.topic.class == Topic
   end
 end
diff --git a/spec/requests/notifications_controller_spec.rb b/spec/requests/notifications_controller_spec.rb
@@ -443,27 +443,36 @@ def expect_correct_notifications(response)
         end
 
         context "when a notification topic has localizations" do
-          fab!(:jap_user) { Fabricate(:user, locale: "ja") }
-          fab!(:topic) { Fabricate(:topic, locale: "en") }
+          fab!(:english_topic) { Fabricate(:topic, locale: "en") }
           fab!(:topic_localization_es) do
-            Fabricate(:topic_localization, topic:, locale: "es", fancy_title: "Hola Mundo")
+            Fabricate(
+              :topic_localization,
+              topic: english_topic,
+              locale: "es",
+              fancy_title: "Hola Mundo",
+            )
           end
           fab!(:topic_localization_ja) do
-            Fabricate(:topic_localization, topic:, locale: "ja", fancy_title: "こんにちは世界")
+            Fabricate(
+              :topic_localization,
+              topic: english_topic,
+              locale: "ja",
+              fancy_title: "こんにちは世界",
+            )
           end
           fab!(:notification) do
             Fabricate(
               :notification,
-              topic:,
-              user: jap_user,
+              topic: english_topic,
+              user:,
               notification_type: Notification.types[:liked],
             )
           end
 
           it "displays the localized fancy title in the user's locale when content_localization_enabled enabled" do
             SiteSetting.content_localization_enabled = true
             SiteSetting.allow_user_locale = true
-            sign_in(jap_user)
+            user.update!(locale: "ja")
 
             get "/notifications.json"
 
@@ -475,13 +484,13 @@ def expect_correct_notifications(response)
           it "does not display the localized fancy title in the user's locale when content_localization_enabled disabled" do
             SiteSetting.content_localization_enabled = false
             SiteSetting.allow_user_locale = true
-            sign_in(jap_user)
+            user.update!(locale: "ja")
 
             get "/notifications.json"
 
             expect(response.status).to eq(200)
             notifications = response.parsed_body["notifications"]
-            expect(notifications.first["fancy_title"]).to eq(topic.fancy_title)
+            expect(notifications.first["fancy_title"]).to eq(english_topic.fancy_title)
           end
         end
       end