github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 04:19:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Switch to data attributes to represent sidebar section name (#20771)

Browse Source 
Data attributes are less restrictive than the class attribute.
This commit is contained in:
Alan Guo Xiang Tan
2023-03-23 13:09:45 +08:00
committed by GitHub
parent d87e78616d
commit 2d46824a87
15 changed files with 455 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/chat/spec/system/list_channels/sidebar_spec.rb
View File

@ -22,7 +22,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
end
it "shows the channel in the correct section" do
expect(page.find(".sidebar-section-chat-channels")).to have_content(
expect(page.find(".sidebar-section[data-section-name='chat-channels']")).to have_content(
category_channel_1.name,
)
end
@ -70,7 +70,9 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
before { visit("/") }
it "shows the channel in the correct section" do
expect(page.find(".sidebar-section-chat-dms")).to have_content(current_user.username)
expect(page.find(".sidebar-section[data-section-name='chat-dms']")).to have_content(
current_user.username,
)
end
end
@ -87,7 +89,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
context "when no category channels" do
it "doesn’t show the section" do
visit("/")
expect(page).to have_no_css(".sidebar-section-chat-channels")
expect(page).to have_no_css(".sidebar-section[data-section-name='chat-channels']")
end
context "when user can create channels" do
@ -95,7 +97,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
it "shows the section" do
visit("/")
expect(page).to have_css(".sidebar-section-chat-channels")
expect(page).to have_css(".sidebar-section[data-section-name='chat-channels']")
end
end
end
@ -104,7 +106,7 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
before { visit("/") }
it "shows the section" do
expect(page).to have_css(".sidebar-section-chat-dms")
expect(page).to have_css(".sidebar-section[data-section-name='chat-dms']")
end
end
@ -115,8 +117,8 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
end
it "doesn’t show the sections" do
expect(page).to have_no_css(".sidebar-section-chat-channels")
expect(page).to have_no_css(".sidebar-section-chat-dms")
expect(page).to have_no_css(".sidebar-section[data-section-name='chat-channels']")
expect(page).to have_no_css(".sidebar-section[data-section-name='chat-dms']")
end
end
@ -128,8 +130,8 @@ RSpec.describe "List channels | sidebar", type: :system, js: true do
end
it "doesn’t show the sections" do
expect(page).to have_no_css(".sidebar-section-chat-channels")
expect(page).to have_no_css(".sidebar-section-chat-dms")
expect(page).to have_no_css(".sidebar-section[data-section-name='chat-channels']")
expect(page).to have_no_css(".sidebar-section[data-section-name='chat-dms']")
end
end

14
plugins/chat/spec/system/page_objects/sidebar/sidebar.rb
View File

@ -4,19 +4,25 @@ module PageObjects
module Pages
class Sidebar < PageObjects::Pages::Base
def channels_section
find(".sidebar-section-chat-channels")
find(".sidebar-section[data-section-name='chat-channels']")
end
def dms_section
find(".sidebar-section-chat-dms")
find(".sidebar-section[data-section-name='chat-dms']")
end
def open_draft_channel
find(".sidebar-section-chat-dms .sidebar-section-header-button", visible: false).click
find(
".sidebar-section[data-section-name='chat-dms'] .sidebar-section-header-button",
visible: false,
).click
end
def open_browse
find(".sidebar-section-chat-channels .sidebar-section-header-button", visible: false).click
find(
".sidebar-section[data-section-name='chat-channels'] .sidebar-section-header-button",
visible: false,
).click
end
def open_channel(channel)