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

FIX: Don't try to rename group when username is taken

Browse Source 
FIX: Always rename groups with the default locale instead of using the user's locale
This commit is contained in:
Gerhard Schlager
2019-02-19 22:31:03 +01:00
parent dbcf05d62c
commit 5d75bd4831
3 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spec/models/group_spec.rb
View File

@@ -236,7 +236,6 @@ describe Group do
it "does not reset the localized name" do
begin
default_locale = SiteSetting.default_locale
I18n.locale = SiteSetting.default_locale = 'fi'
group = Group.find(Group::AUTO_GROUPS[:everyone])
@@ -251,41 +250,43 @@ describe Group do
Group.refresh_automatic_group!(:everyone)
expect(group.reload.name).to eq(I18n.t("groups.default_names.everyone"))
ensure
I18n.locale = SiteSetting.default_locale = default_locale
end
end
it "uses the localized name if name has not been taken" do
begin
default_locale = SiteSetting.default_locale
I18n.locale = SiteSetting.default_locale = 'de'
group = Group.refresh_automatic_group!(:staff)
expect(group.name).to_not eq('staff')
expect(group.name).to eq(I18n.t('groups.default_names.staff'))
ensure
I18n.locale = SiteSetting.default_locale = default_locale
end
end
it "does not use the localized name if name has already been taken" do
begin
default_locale = SiteSetting.default_locale
I18n.locale = SiteSetting.default_locale = 'de'
_another_group = Fabricate(:group,
name: I18n.t('groups.default_names.staff').upcase
)
Fabricate(:group, name: I18n.t('groups.default_names.staff').upcase)
group = Group.refresh_automatic_group!(:staff)
expect(group.name).to eq('staff')
ensure
I18n.locale = SiteSetting.default_locale = default_locale
Fabricate(:user_single_email, username: I18n.t('groups.default_names.moderators').upcase)
group = Group.refresh_automatic_group!(:moderators)
expect(group.name).to eq('moderators')
end
end
it "always uses the default locale" do
SiteSetting.default_locale = "de"
I18n.locale = "en"
group = Group.refresh_automatic_group!(:staff)
expect(group.name).to_not eq('staff')
expect(group.name).to eq(I18n.t('groups.default_names.staff', locale: "de"))
end
end
it "Correctly handles removal of primary group" do