github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-02 20:46:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Do not override channel name when category selected (#19920)

Browse Source
This commit is contained in:
Martin Brennan 2023-01-19 18:35:59 +10:00 committed by Bianca Nenciu
parent df30d1fd07
commit 7a074e6684
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/chat/assets/javascripts/discourse/controllers/create-channel.js
View File

@ -149,7 +149,7 @@ export default class CreateChannelController extends Controller.extend(
this.setProperties({ this.setProperties({
categoryId, categoryId,
category, category,
name: category?.name || "", name: this.name || category?.name || "",
}); });
} }

11
plugins/chat/spec/system/create_channel_spec.rb
View File

@ -22,6 +22,16 @@ RSpec.describe "Create channel", type: :system, js: true do
expect(find(".create-channel-hint")).to have_content(Group[:everyone].name) expect(find(".create-channel-hint")).to have_content(Group[:everyone].name)
end end
it "does not override channel name if that was already specified" do
visit("/chat")
find(".new-channel-btn").click
fill_in("channel-name", with: "My Cool Channel")
find(".category-chooser").click
find(".category-row[data-value=\"#{category_1.id}\"]").click
expect(page).to have_field("channel-name", with: "My Cool Channel")
end
context "when category is private" do context "when category is private" do
fab!(:group_1) { Fabricate(:group) } fab!(:group_1) { Fabricate(:group) }
fab!(:private_category_1) { Fabricate(:private_category, group: group_1) } fab!(:private_category_1) { Fabricate(:private_category, group: group_1) }
@ -95,6 +105,7 @@ RSpec.describe "Create channel", type: :system, js: true do
name = "Cats" name = "Cats"
find(".category-chooser").click find(".category-chooser").click
find(".category-row[data-value=\"#{category_1.id}\"]").click find(".category-row[data-value=\"#{category_1.id}\"]").click
expect(page).to have_field("channel-name", with: category_1.name)
fill_in("channel-name", with: name) fill_in("channel-name", with: name)
fill_in("channel-description", with: "All kind of cute cats") fill_in("channel-description", with: "All kind of cute cats")
find(".create-channel-modal .create").click find(".create-channel-modal .create").click