From 58a3cdc6aeef5f575564fa9269b13e3fd00edc16 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 30 Jun 2023 11:08:29 +1000
Subject: [PATCH] DEV: Try fix flaky chat navigation spec (#22356)

Followup to e57070af92e86acf91acab7f419c6e9f4f0b32ab,
try to check for href of link first before clicking.
---
 plugins/chat/spec/system/navigation_spec.rb            |  6 +++++-
 .../chat/spec/system/page_objects/chat/chat_thread.rb  | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/chat/spec/system/navigation_spec.rb b/plugins/chat/spec/system/navigation_spec.rb
index 00b5adb2201..39bde751aaa 100644
--- a/plugins/chat/spec/system/navigation_spec.rb
+++ b/plugins/chat/spec/system/navigation_spec.rb
@@ -142,13 +142,14 @@ RSpec.describe "Navigation", type: :system do
     end
 
     context "when opening a thread from the thread list" do
-      xit "goes back to the thread list when clicking the back button" do
+      it "goes back to the thread list when clicking the back button" do
         visit("/chat")
         chat_page.visit_channel(category_channel)
         channel_page.open_thread_list
         expect(thread_list_page).to have_loaded
         thread_list_page.open_thread(thread)
         expect(side_panel_page).to have_open_thread(thread)
+        expect(thread_page).to have_back_link_to_thread_list(category_channel)
         thread_page.back_to_previous_route
         expect(thread_list_page).to have_loaded
       end
@@ -161,6 +162,7 @@ RSpec.describe "Navigation", type: :system do
           expect(thread_list_page).to have_loaded
           thread_list_page.open_thread(thread)
           expect(side_panel_page).to have_open_thread(thread)
+          expect(thread_page).to have_back_link_to_thread_list(category_channel)
           thread_page.back_to_previous_route
           expect(thread_list_page).to have_loaded
         end
@@ -173,6 +175,7 @@ RSpec.describe "Navigation", type: :system do
         chat_page.visit_channel(category_channel)
         channel_page.message_thread_indicator(thread.original_message).click
         expect(side_panel_page).to have_open_thread(thread)
+        expect(thread_page).to have_back_link_to_thread_list(category_channel)
         thread_page.back_to_previous_route
         expect(thread_list_page).to have_loaded
       end
@@ -184,6 +187,7 @@ RSpec.describe "Navigation", type: :system do
           chat_page.visit_channel(category_channel)
           channel_page.message_thread_indicator(thread.original_message).click
           expect(side_panel_page).to have_open_thread(thread)
+          expect(thread_page).to have_back_link_to_channel(category_channel)
           thread_page.back_to_previous_route
           expect(side_panel_page).not_to be_open
         end
diff --git a/plugins/chat/spec/system/page_objects/chat/chat_thread.rb b/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
index b13ac8d5e6d..a16e73373dc 100644
--- a/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
+++ b/plugins/chat/spec/system/page_objects/chat/chat_thread.rb
@@ -58,6 +58,16 @@ module PageObjects
         header.find(".chat-thread__close").click
       end
 
+      def has_back_link_to_thread_list?(channel)
+        header.has_css?(
+          ".chat-thread__back-to-previous-route[href='#{channel.relative_url + "/t"}']",
+        )
+      end
+
+      def has_back_link_to_channel?(channel)
+        header.has_css?(".chat-thread__back-to-previous-route[href='#{channel.relative_url}']")
+      end
+
       def back_to_previous_route
         header.find(".chat-thread__back-to-previous-route").click
       end