IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Fix chat sidebar system spec flaky (#19844)

Browse Source 
The spec was flaky because it was dependent on order,
when usernames got high enough sequence numbers in them
we would get this error:

> expected to find text "bruce99, bruce100" in "bruce100, bruce99"

Also move selectors into page object and use them in the
spec instead.
This commit is contained in:
Martin Brennan 2023-01-12 14:12:49 +10:00 committed by GitHub
parent 2ed75dbaf6
commit 9a6eefaafc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,14 @@
module PageObjects
module Pages
class Sidebar < PageObjects::Pages::Base
def channels_section
find(".sidebar-section-chat-channels")
end
def dms_section
find(".sidebar-section-chat-dms")
end
def open_draft_channel
find(".sidebar-section-chat-dms .sidebar-section-header-button", visible: false).click
end

52
plugins/chat/spec/system/sidebar_navigation_menu_spec.rb
View File

@ -1,6 +1,8 @@
# frozen_string_literal: true
RSpec.describe "Sidebar navigation menu", type: :system, js: true do
let(:sidebar_page) { PageObjects::Pages::Sidebar.new }
fab!(:current_user) { Fabricate(:user) }
before do
@ -18,8 +20,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
it "displays correct channels section title" do
visit("/")
expect(page).to have_css(
".sidebar-section-chat-channels .sidebar-section-header-text",
expect(sidebar_page.channels_section).to have_css(
".sidebar-section-header-text",
text: I18n.t("js.chat.chat_channels"),
)
end
@ -27,8 +29,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
it "displays the correct hash icon prefix" do
visit("/")
expect(page).to have_css(
".sidebar-section-chat-channels .sidebar-section-link-#{channel_1.slug} .sidebar-section-link-prefix svg.prefix-icon.d-icon-hashtag",
expect(sidebar_page.channels_section).to have_css(
".sidebar-section-link-#{channel_1.slug} .sidebar-section-link-prefix svg.prefix-icon.d-icon-hashtag",
)
end
@ -53,8 +55,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
it "has a lock badge" do
visit("/")
expect(page).to have_css(
".sidebar-section-chat-channels .sidebar-section-link-#{private_channel_1.slug} .sidebar-section-link-prefix svg.prefix-badge.d-icon-lock",
expect(sidebar_page.channels_section).to have_css(
".sidebar-section-link-#{private_channel_1.slug} .sidebar-section-link-prefix svg.prefix-badge.d-icon-lock",
)
end
end
@ -67,8 +69,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
it "unescapes the emoji" do
visit("/")
expect(page).to have_css(
".sidebar-section-chat-channels .sidebar-section-link-#{channel_1.slug} .emoji",
expect(sidebar_page.channels_section).to have_css(
".sidebar-section-link-#{channel_1.slug} .emoji",
)
end
end
@ -88,8 +90,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
it "has a muted class" do
visit("/")
expect(page).to have_css(
".sidebar-section-chat-channels .sidebar-section-link-#{channel_2.slug}.sidebar-section-link--muted",
expect(sidebar_page.channels_section).to have_css(
".sidebar-section-link-#{channel_2.slug}.sidebar-section-link--muted",
)
end
end
@ -101,9 +103,7 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
visit("/")
expect(
page.find(".sidebar-section-chat-channels .sidebar-section-link-#{channel_1.slug}")[
"title"
],
sidebar_page.channels_section.find(".sidebar-section-link-#{channel_1.slug}")["title"],
).to eq("&lt;script&gt;alert(&#x27;hello&#x27;)&lt;/script&gt;")
end
end
@ -118,8 +118,8 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
visit("/")
expect(
page.find(
".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1) .sidebar-section-link-prefix img",
sidebar_page.dms_section.find(
"a.sidebar-section-link:nth-child(1) .sidebar-section-link-prefix img",
)[
"src"
],
@ -130,7 +130,7 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
visit("/")
expect(
page.find(".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1)"),
sidebar_page.dms_section.find("a.sidebar-section-link:nth-child(1)"),
).to have_content(other_user.username)
end
@ -143,27 +143,27 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
it "displays the status" do
visit("/")
expect(
page.find(".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1)"),
).to have_css(".user-status")
expect(sidebar_page.dms_section.find("a.sidebar-section-link:nth-child(1)")).to have_css(
".user-status",
)
end
end
end
context "when channel has more than 2 participants" do
fab!(:user_1) { Fabricate(:user) }
fab!(:user_2) { Fabricate(:user) }
fab!(:user_1) { Fabricate(:user, username: "zoesmith") }
fab!(:user_2) { Fabricate(:user, username: "alansmith") }
fab!(:dm_channel_1) do
Fabricate(:direct_message_channel, users: [current_user, user_1, user_2])
end
it "displays all participants names" do
it "displays all participants names in alphabetical order" do
visit("/")
expect(
page.find(
".sidebar-section-chat-dms a.sidebar-section-link:nth-child(1) .sidebar-section-link-content-text",
sidebar_page.dms_section.find(
"a.sidebar-section-link:nth-child(1) .sidebar-section-link-content-text",
),
).to have_content("#{user_1.username}, #{user_2.username}")
).to have_content("alansmith, zoesmith")
end
end
@ -179,7 +179,7 @@ RSpec.describe "Sidebar navigation menu", type: :system, js: true do
it "escapes the title attribute using it" do
visit("/")
expect(page.find(".sidebar-section-chat-dms .channel-#{dm_channel_1.id}")["title"]).to eq(
expect(sidebar_page.dms_section.find(".channel-#{dm_channel_1.id}")["title"]).to eq(
"Chat with @&lt;script&gt;alert(&#x27;hello&#x27;)&lt;/script&gt;",
)
end