mirror of
https://github.com/discourse/discourse.git
synced 2024-11-30 18:55:27 +08:00
161d3d190a
This fixes:
- a regression from 30c152c, where navigating to a topic's last reply
via keyboard would lose track of the topic when returning to the topic
list
- an issue where if a topic's last post is a small post, navigating to it
via keyboard would not focus the post
Co-authored-by: David Taylor <david@taylorhq.com>
85 lines
2.8 KiB
Ruby
85 lines
2.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
describe "Topic list focus", type: :system do
|
|
fab!(:topics) { Fabricate.times(10, :post).map(&:topic) }
|
|
|
|
before_all do
|
|
sidebar_url = Fabricate(:sidebar_url, name: "my topic link", value: "/t/#{topics[4].id}")
|
|
|
|
Fabricate(
|
|
:sidebar_section_link,
|
|
sidebar_section:
|
|
SidebarSection.find_by(section_type: SidebarSection.section_types[:community]),
|
|
linkable: sidebar_url,
|
|
)
|
|
end
|
|
|
|
let(:discovery) { PageObjects::Pages::Discovery.new }
|
|
let(:topic) { PageObjects::Pages::Topic.new }
|
|
|
|
def focussed_topic_id
|
|
page.evaluate_script(
|
|
"document.activeElement.closest('.topic-list-item')?.dataset.topicId",
|
|
)&.to_i
|
|
end
|
|
|
|
it "refocusses last clicked topic when going back to topic list" do
|
|
visit("/latest")
|
|
expect(page).to have_css("body.navigation-topics")
|
|
expect(discovery.topic_list).to have_topics
|
|
|
|
# Click a topic
|
|
discovery.topic_list.visit_topic(topics[5])
|
|
expect(topic).to have_topic_title(topics[5].title)
|
|
|
|
# Going back to the topic-list should re-focus
|
|
page.go_back
|
|
expect(page).to have_css("body.navigation-topics")
|
|
expect(focussed_topic_id).to eq(topics[5].id)
|
|
|
|
# Click topic again
|
|
discovery.topic_list.visit_topic(topics[5])
|
|
expect(topic).to have_topic_title(topics[5].title)
|
|
|
|
# Visiting a topic list another way should not focus
|
|
find(".sidebar-section-link[data-link-name='everything']").click
|
|
expect(page).to have_css("body.navigation-topics")
|
|
expect(focussed_topic_id).to eq(nil)
|
|
end
|
|
|
|
it "refocusses properly when navigating via the 'last activity' link" do
|
|
visit("/latest")
|
|
|
|
# Visit topic via activity column and keyboard
|
|
discovery.topic_list.visit_topic_last_reply_via_keyboard(topics[2])
|
|
expect(topic).to have_topic_title(topics[2].title)
|
|
|
|
# Going back to the topic-list should re-focus
|
|
page.go_back
|
|
expect(page).to have_css("body.navigation-topics")
|
|
expect(focussed_topic_id).to eq(topics[2].id)
|
|
|
|
# Visit topic via keyboard using posts map (OP button)
|
|
discovery.topic_list.visit_topic_first_reply_via_keyboard(topics[4])
|
|
expect(topic).to have_topic_title(topics[4].title)
|
|
|
|
# Going back to the topic-list should re-focus
|
|
page.go_back
|
|
expect(page).to have_css("body.navigation-topics")
|
|
expect(focussed_topic_id).to eq(topics[4].id)
|
|
end
|
|
|
|
it "does not refocus topic when visiting via something other than topic list" do
|
|
visit("/latest")
|
|
|
|
# Clicking sidebar link should visit topic
|
|
find(".sidebar-section-link[data-link-name='my topic link']").click
|
|
expect(topic).to have_topic_title(topics[4].title)
|
|
|
|
# Going back to the topic-list should not re-focus
|
|
page.go_back
|
|
expect(page).to have_css("body.navigation-topics")
|
|
expect(focussed_topic_id).to eq(nil)
|
|
end
|
|
end
|