A platform for community discussion. Free, open, simple.
UX: Introduce anonymous and logged_in_users auto groups (#39516)
Martin Brennan475ff1b0fac4
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rbindex 95314b61aaf..7defc1d84e8 100644--- a/app/controllers/groups_controller.rb+++ b/app/controllers/groups_controller.rb@@ -686,12 +686,17 @@ class GroupsController < ApplicationControllerenddef search- include_everyone = params[:include_everyone] == "true"+ include_everyone =+ (params[:include_everyone] == "true" || params[:include_pseudogroups] == "true")+ include_pseudogroups = params[:include_pseudogroups] == "true"order = ["name"]groups =- Group.visible_groups(current_user, order, include_everyone: include_everyone).includes(- :flair_upload,- )+ Group.visible_groups(+ current_user,+ order,+ include_everyone: include_everyone,+ include_pseudogroups: include_pseudogroups,+ ).includes(:flair_upload)if (term = params[:term]).present?groups =diff --git a/app/models/group.rb b/app/models/group.rbindex cd9d08de227..8fcb3480f22 100644--- a/app/models/group.rb+++ b/app/models/group.rb@@ -104,6 +104,8 @@ class Group < ActiveRecord::Baseadmins: 1,moderators: 2,staff: 3,+ anonymous: 4,+ logged_in_users: 5,trust_level_0: 10,trust_level_1: 11,trust_level_2: 12,@@ -151,7 +153,15 @@ class Group < ActiveRecord::Basereturn [] if lower_group.blank? || upper_group.blank?- (lower_group..upper_group).to_a & AUTO_GROUPS.values+ (lower_group..upper_group).to_a &+ (+ AUTO_GROUPS.values -+ [+ Group::AUTO_GROUPS[:anonymous],+ Group::AUTO_GROUPS[:logged_in_users],+ Group::AUTO_GROUPS[:everyone],+ ]+ )endvalidates :mentionable_level, inclusion: { in: ALIAS_LEVELS.values }@@ -165,7 +175,16 @@ class Group < ActiveRecord::Basegroups = groups.order(order) if ordergroups = groups.order("groups.name ASC") unless order&.include?("name")- groups = groups.where("groups.id > 0") if !opts || !opts[:include_everyone]+ opts ||= {}++ if !opts[:include_pseudogroups]+ groups = groups.where("groups.id > 0") unless opts[:include_everyone]+ groups =+ groups.where(+ "groups.id NOT IN (:ids)",+ ids: [Group::AUTO_GROUPS[:anonymous], Group::AUTO_GROUPS[:logged_in_users]],+ )+ endif !user&.adminis_staff = !!user&.staff?@@ -220,7 +239,16 @@ class Group < ActiveRecord::BaseProc.new { |user, order, opts|groups = self.order(order || "name ASC")- groups = groups.where("groups.id > 0") if !opts || !opts[:include_everyone]+ opts ||= {}++ if !opts[:include_pseudogroups]+ groups = groups.where("groups.id > 0") unless opts[:include_everyone]+ groups =+ groups.where(+ "groups.id NOT IN (:ids)",+ ids: [Group::AUTO_GROUPS[:anonymous], Group::AUTO_GROUPS[:logged_in_users]],+ )+ endif !user&.adminis_staff = !!user&.staff?@@ -528,10 +556,11 @@ class Group < ActiveRecord::Basegroup.name = default_nameend- # the everyone group is special, it can include non-users so there is no- # way to have the membership in a table+ # the everyone, anonymous, and logged_in_users groups are special — they+ # represent implicit populations (unauthenticated visitors, or all logged-in+ # users) that cannot be enumerated via group_users rows.case name- when :everyone+ when :everyone, :anonymous, :logged_in_usersgroup.visibility_level = Group.visibility_levels[:staff]group.save!return groupdiff --git a/app/models/user.rb b/app/models/user.rbindex c8e0f192dd4..b72753c71bc 100644--- a/app/models/user.rb+++ b/app/models/user.rb@@ -544,9 +544,21 @@ class User < ActiveRecord::Baseenddef in_any_groups?(group_ids)- group_ids.include?(Group::AUTO_GROUPS[:everyone]) ||- (is_system_user? && (Group.auto_groups_between(:admins, :trust_level_4) & group_ids).any?) ||- (group_ids & belonging_to_group_ids).any?+ # We can avoid looking up the user's actual groups+ # for these global pseudogroups. In Guardian::AnonymousUser#in_any_groups?,+ # we only return true if group_ids include the :anonymous auto group.+ if group_ids.include?(Group::AUTO_GROUPS[:everyone]) ||+ group_ids.include?(Group::AUTO_GROUPS[:logged_in_users])+ return true+ end++ # Sometimes the system user doesn't have their auto groups+ # from some strange edge case, this handles it.+ if (is_system_user? && ((Group.auto_groups_between(:admins, :trust_level_4)) & group_ids).any?)+ return true+ end++ (group_ids & belonging_to_group_ids).any?enddef belonging_to_group_idsdiff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 73fdb8f0a4f..d38f36b0ca6 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -671,6 +671,8 @@ en:admins: "admins"moderators: "moderators"staff: "staff"+ anonymous: "anonymous"+ logged_in_users: "logged_in_users"trust_level_0: "trust_level_0"trust_level_1: "trust_level_1"trust_level_2: "trust_level_2"@@ -679,6 +681,8 @@ en:default_descriptions:everyone: "Automatic group including all members"staff: "Automatic group including admins and moderators"+ anonymous: "Automatic pseudogroup representing unauthenticated visitors"+ logged_in_users: "Automatic pseudogroup including every logged-in user"admins: "Responsible for configuring and maintaining this site, with access to all member and activity data"moderators: "Responsible for responding to flags, moderating discussions, and helping members with their accounts"trust_level_0: "New members with limited abilities, who are learning community norms and functionality"diff --git a/config/site_settings.yml b/config/site_settings.ymlindex 28cc0439f8a..8534121dbbe 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -456,7 +456,7 @@ basic:default: ""allow_any: falserefresh: true- disallowed_groups: "0"+ disallowed_groups: "0|4|5"area: "group_permissions"hidden_post_visible_groups:type: group_list@@ -464,6 +464,7 @@ basic:default: "14"allow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"push_notifications_prompt:default: true@@ -541,11 +542,13 @@ basic:about_page_hidden_groups:default: ""type: group_list+ disallowed_groups: "4"area: "group_permissions"about_page_extra_groups:client: truedefault: ""type: group_list+ disallowed_groups: "4"area: "about"about_page_extra_groups_initial_members:client: true@@ -1076,6 +1079,7 @@ users:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"validator: "AtLeastOneGroupValidator"area: "group_permissions"anonymous_account_duration_minutes:@@ -1343,6 +1347,7 @@ posting:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"editing_grace_period:default: 300@@ -1365,6 +1370,7 @@ posting:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"validator: "AtLeastOneGroupValidator"area: "group_permissions"post_edit_time_limit:@@ -1469,6 +1475,7 @@ posting:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"title_max_word_length:default: 30@@ -1600,6 +1607,7 @@ posting:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"approve_new_topics_unless_allowed_groups:default: "1|2|10" # auto groups admins, moderators, trust_level_0@@ -1607,6 +1615,7 @@ posting:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"approve_suspect_users:default: true@@ -1701,6 +1710,7 @@ posting:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"blur_tl0_flagged_posts_media:default: true@@ -1769,6 +1779,7 @@ content_localization:allow_any: falseclient: truedefault: "1|2" # admin, moderator+ disallowed_groups: "4"area: "localization"content_localization_allow_author_localization:default: true@@ -1862,6 +1873,7 @@ nested_replies:default: "3"allow_any: falserefresh: true+ disallowed_groups: "4"area: "posts_and_topics"depends_on:- "nested_replies_enabled"@@ -1998,6 +2010,7 @@ email:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"email_in_authserv_id:default: ""@@ -2198,6 +2211,7 @@ email:default: "1|2"allow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"files:@@ -2385,6 +2399,7 @@ files:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"default_avatars:default: ""@@ -2543,6 +2558,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"edit_wiki_post_allowed_groups:default: "1|2|11" # auto group admins, moderators, trust_level_1@@ -2550,6 +2566,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"edit_post_allowed_groups:default: "1|2|10" # auto group admins, moderators, trust_level_0@@ -2557,6 +2574,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"self_wiki_allowed_groups:default: "1|2|13" # auto group admins, moderators, trust_level_3@@ -2564,6 +2582,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"send_email_messages_allowed_groups:default: "1|2|14" # auto group admins, moderators, trust_level_4@@ -2571,6 +2590,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"flag_post_allowed_groups:default: "1|2|11" # auto group admins, moderators, trust_level_1@@ -2578,6 +2598,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "flags|group_permissions"allow_all_users_to_flag_illegal_content:default: false@@ -2593,6 +2614,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"embedded_media_post_allowed_groups:default: "1|2|10" # auto group admins, moderators, trust_level_0@@ -2600,6 +2622,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"profile_background_allowed_groups:default: "1|2|10" # auto group admins, moderators, trust_level_0@@ -2607,6 +2630,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"user_card_background_allowed_groups:default: "1|2|10" # auto group admins, moderators, trust_level_0@@ -2614,6 +2638,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"invite_allowed_groups:default: "1|2|12" # auto group admins, moderators, trust_level_2@@ -2621,6 +2646,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"ignore_allowed_groups:default: "1|2|12" # auto group admins, moderators, trust_level_2@@ -2628,6 +2654,7 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"allow_flagging_staff: truesend_tl1_welcome_message: true@@ -2729,15 +2756,18 @@ trust:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"edit_all_topic_groups:default: "13"type: group_list+ disallowed_groups: "4"area: "group_permissions"edit_all_post_groups:default: "1|2|14" # auto group admins, moderators, and TL4mandatory_values: "1|2" # auto group admins, moderatorstype: group_list+ disallowed_groups: "4"area: "group_permissions"security:@@ -2785,6 +2815,7 @@ security:type: group_listlist_type: compactdefault: ""+ disallowed_groups: "4"moderators_view_emails:client: truedefault: false@@ -4125,6 +4156,7 @@ user_api:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"allowed_user_api_push_urls:default: ""@@ -4188,6 +4220,7 @@ tags:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"edit_tags_allowed_groups:default: "1|2" # auto group admins, moderators@@ -4195,6 +4228,7 @@ tags:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"tag_topic_allowed_groups:default: "1|2|10" # auto group admins, moderators, trust_level_0@@ -4202,6 +4236,7 @@ tags:type: group_listallow_any: falserefresh: true+ disallowed_groups: "4"client: truearea: "group_permissions"max_tag_search_results:@@ -4231,6 +4266,7 @@ tags:default: ""allow_any: falserefresh: true+ disallowed_groups: "4"area: "group_permissions"suppress_overlapping_tags_in_list:default: falsediff --git a/db/migrate/20260424004343_ensure_anonymous_and_logged_in_users_auto_groups.rb b/db/migrate/20260424004343_ensure_anonymous_and_logged_in_users_auto_groups.rbnew file mode 100644index 00000000000..30c8186a757--- /dev/null+++ b/db/migrate/20260424004343_ensure_anonymous_and_logged_in_users_auto_groups.rb@@ -0,0 +1,79 @@+# frozen_string_literal: true++class EnsureAnonymousAndLoggedInUsersAutoGroups < ActiveRecord::Migration[8.0]+ def up+ legacy_anonymous_group_id = DB.query_single(<<~SQL).first+ SELECT id FROM groups WHERE name = 'anonymous' AND id <> 4;+ SQL++ legacy_logged_in_users_group_id = DB.query_single(<<~SQL).first+ SELECT id FROM groups WHERE name = 'logged_in_users' AND id <> 5;+ SQL++ # Make sure any existing groups with the name `anonymous` or+ # `logged_in_users` are renamed to avoid conflicts with the+ # new auto groups. Also make sure to rebake posts & update group mentions.+ if legacy_anonymous_group_id.present?+ execute(<<~SQL)+ UPDATE groups SET name = 'anonymous_legacy_' || id::text+ WHERE name = 'anonymous' AND id <> 4;+ SQL++ update_group_mentions(+ "anonymous",+ "anonymous_legacy_#{legacy_anonymous_group_id}",+ legacy_anonymous_group_id,+ )+ end++ if legacy_logged_in_users_group_id.present?+ execute(<<~SQL)+ UPDATE groups SET name = 'logged_in_users_legacy_' || id::text+ WHERE name = 'logged_in_users' AND id <> 5;+ SQL++ update_group_mentions(+ "logged_in_users",+ "logged_in_users_legacy_#{legacy_logged_in_users_group_id}",+ legacy_logged_in_users_group_id,+ )+ end++ # The `anonymous` (id 4) and `logged_in_users` (id 5) auto groups are+ # pseudogroups — they have no group_users rows; membership is implicit.+ # Seed the rows here so callers that look them up by id don't fail before+ # db/fixtures/002_groups.rb runs.+ execute(<<~SQL)+ INSERT INTO groups (id, name, automatic, visibility_level, created_at, updated_at)+ VALUES+ (4, 'anonymous', true, 3, NOW(), NOW()),+ (5, 'logged_in_users', true, 3, NOW(), NOW())+ ON CONFLICT (id) DO NOTHING+ SQL+ end++ def down+ raise ActiveRecord::IrreversibleMigration+ end++ def update_group_mentions(old_slug, new_slug, legacy_group_id)+ DB.exec(<<~SQL, old_slug:, new_slug:, group_id: legacy_group_id)+ UPDATE posts AS p SET+ raw = regexp_replace(+ p.raw,+ '(^|\s)(@' || :old_slug || ')(\s|$)',+ E'\\1@' || :new_slug || E'\\3',+ 'g'+ ),+ baked_version = NULL+ WHERE p.deleted_at IS NULL+ AND EXISTS (+ SELECT 1+ FROM group_mentions gm+ WHERE gm.post_id = p.id+ AND gm.group_id = :group_id+ )+ AND p.raw LIKE '%@' || :old_slug || '%';+ SQL+ end+enddiff --git a/lib/guardian.rb b/lib/guardian.rbindex a048d610221..bf3862a7b22 100644--- a/lib/guardian.rb+++ b/lib/guardian.rb@@ -100,7 +100,7 @@ class Guardianenddef in_any_groups?(group_ids)- false+ group_ids.include?(Group::AUTO_GROUPS[:anonymous])endenddiff --git a/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rb b/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rbindex 409e03da0d5..bee6d18c354 100644--- a/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rb+++ b/plugins/discourse-ai/spec/services/discourse_ai/credit_status_checker_spec.rb@@ -98,7 +98,10 @@ RSpec.describe DiscourseAi::CreditStatusChecker doFabricate(:ai_agent,default_llm_id: llm_model.id,- allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ allowed_group_ids: [+ Group::AUTO_GROUPS[:everyone],+ Group::AUTO_GROUPS[:logged_in_users],+ ],)params[:agent_ids] = [ai_agent.id, agent2.id]@@ -123,7 +126,7 @@ RSpec.describe DiscourseAi::CreditStatusChecker doFabricate(:ai_agent,default_llm_id: llm_model.id,- allowed_group_ids: [Group::AUTO_GROUPS[:everyone]],+ allowed_group_ids: [Group::AUTO_GROUPS[:everyone], Group::AUTO_GROUPS[:logged_in_users]],)enddiff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rbindex 41d53989379..4d937038cdc 100644--- a/spec/lib/guardian_spec.rb+++ b/spec/lib/guardian_spec.rb@@ -37,6 +37,24 @@ RSpec.describe Guardian doexpect { Guardian.new(user) }.not_to raise_errorend+ describe "AnonymousUser#in_any_groups?" do+ let(:anon) { Guardian::AnonymousUser.new }++ it "returns true when the anonymous auto group is in the list" do+ expect(anon.in_any_groups?([Group::AUTO_GROUPS[:anonymous]])).to eq(true)+ expect(+ anon.in_any_groups?([Group::AUTO_GROUPS[:admins], Group::AUTO_GROUPS[:anonymous]]),+ ).to eq(true)+ end++ it "returns false for any other group, including everyone and logged_in_users" do+ expect(anon.in_any_groups?([Group::AUTO_GROUPS[:everyone]])).to eq(false)+ expect(anon.in_any_groups?([Group::AUTO_GROUPS[:logged_in_users]])).to eq(false)+ expect(anon.in_any_groups?([Group::AUTO_GROUPS[:admins]])).to eq(false)+ expect(anon.in_any_groups?([])).to eq(false)+ end+ end+describe "can_enable_safe_mode" dofab!(:user)fab!(:moderator)diff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rbindex ad9e3ea7fb1..6d3bb71f208 100644--- a/spec/lib/site_setting_extension_spec.rb+++ b/spec/lib/site_setting_extension_spec.rb@@ -1391,7 +1391,7 @@ RSpec.describe SiteSettingExtension doit "is included in all_settings output" dosetting = SiteSetting.all_settings.find { |s| s[:setting] == :whispers_allowed_groups }- expect(setting[:disallowed_groups]).to eq("0")+ expect(setting[:disallowed_groups]).to eq("0|4|5")endenddiff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rbindex 7245b76133c..9497a79f03a 100644--- a/spec/models/group_spec.rb+++ b/spec/models/group_spec.rb@@ -312,6 +312,16 @@ RSpec.describe Group doit "returns an empty array when passing an unknown group" doexpect(described_class.auto_groups_between(:trust_level_0, :trust_level_1337)).to be_emptyend++ it "excludes pseudogroups that encompass large sets of users" do+ expect(described_class.auto_groups_between(:admins, :trust_level_1)).to contain_exactly(+ 1,+ 2,+ 3,+ 10,+ 11,+ )+ endenddescribe ".refresh_automatic_group!" do@@ -408,6 +418,18 @@ RSpec.describe Group doexpect(g.visibility_level).to eq(Group.visibility_levels[:staff])end+ it "makes sure the anonymous and logged_in_users pseudogroups are hidden and have no members" do+ anon = Group.refresh_automatic_group!(:anonymous)+ expect(anon.id).to eq(Group::AUTO_GROUPS[:anonymous])+ expect(anon.visibility_level).to eq(Group.visibility_levels[:staff])+ expect(GroupUser.where(group_id: anon.id).count).to eq(0)++ logged_in = Group.refresh_automatic_group!(:logged_in_users)+ expect(logged_in.id).to eq(Group::AUTO_GROUPS[:logged_in_users])+ expect(logged_in.visibility_level).to eq(Group.visibility_levels[:staff])+ expect(GroupUser.where(group_id: logged_in.id).count).to eq(0)+ end+it "makes sure automatic groups are visible to logged on users" dog = Group.refresh_automatic_group!(:moderators)expect(g.visibility_level).to eq(Group.visibility_levels[:logged_on_users])@@ -933,6 +955,39 @@ RSpec.describe Group do).to eq(false)end+ it "includes logged_in_users, anonymous and everyone groups when include_pseudogroups is true" do+ expect(+ Group+ .visible_groups(admin, [], include_pseudogroups: true)+ .where(id: Group::AUTO_GROUPS[:everyone])+ .exists?,+ ).to eq(true)+ expect(+ Group+ .visible_groups(admin, [], include_pseudogroups: true)+ .where(id: Group::AUTO_GROUPS[:anonymous])+ .exists?,+ ).to eq(true)+ expect(+ Group+ .visible_groups(admin, [], include_pseudogroups: true)+ .where(id: Group::AUTO_GROUPS[:logged_in_users])+ .exists?,+ ).to eq(true)+ end++ it "does not include logged_in_users, anonymous and everyone groups by default" do+ expect(+ Group.visible_groups(admin, []).where(id: Group::AUTO_GROUPS[:everyone]).exists?,+ ).to eq(false)+ expect(+ Group.visible_groups(admin, []).where(id: Group::AUTO_GROUPS[:anonymous]).exists?,+ ).to eq(false)+ expect(+ Group.visible_groups(admin, []).where(id: Group::AUTO_GROUPS[:logged_in_users]).exists?,+ ).to eq(false)+ end+it "correctly restricts group visibility" dogroup = Fabricate(:group, visibility_level: Group.visibility_levels[:owners])logged_on_user = Fabricate(:user)diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rbindex 79d51f5cd5b..35263c3a884 100644--- a/spec/models/user_spec.rb+++ b/spec/models/user_spec.rb@@ -30,6 +30,23 @@ RSpec.describe User doexpect(user.in_any_groups?([group.id, Group::AUTO_GROUPS[:everyone]])).to eq(true)end+ it "returns true if any of the group IDs are the 'logged_in_users' auto group" do+ expect(user.in_any_groups?([Group::AUTO_GROUPS[:logged_in_users]])).to eq(true)+ end++ it "never returns true for the 'anonymous' auto group — logged-in users are not anonymous" do+ GroupUser.where(user_id: Discourse::SYSTEM_USER_ID).delete_all+ Discourse.system_user.reload+ expect(user.in_any_groups?([Group::AUTO_GROUPS[:anonymous]])).to eq(false)+ expect(Discourse.system_user.in_any_groups?([Group::AUTO_GROUPS[:anonymous]])).to eq(false)+ end++ it "returns true for the 'anonymous' auto group for anonymous users" do+ expect(+ Guardian.new.instance_variable_get(:@user).in_any_groups?([Group::AUTO_GROUPS[:anonymous]]),+ ).to eq(true)+ end+it "returns true if the user is in the group" doexpect(user.in_any_groups?([group.id])).to eq(false)group.add(user)diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rbindex 283aad43a06..c49173c2bbf 100644--- a/spec/requests/groups_controller_spec.rb+++ b/spec/requests/groups_controller_spec.rb@@ -379,7 +379,15 @@ RSpec.describe GroupsController dodescribe "automatic groups" doit "should return the right response" do- expect_type_to_return_right_groups("automatic", Group::AUTO_GROUP_IDS.keys - [0])+ expect_type_to_return_right_groups(+ "automatic",+ Group::AUTO_GROUP_IDS.keys -+ [+ Group::AUTO_GROUPS[:everyone],+ Group::AUTO_GROUPS[:anonymous],+ Group::AUTO_GROUPS[:logged_in_users],+ ],+ )endend@@ -490,6 +498,8 @@ RSpec.describe GroupsController dogroups = Group::AUTO_GROUPS.keysgroups.delete(:everyone)+ groups.delete(:anonymous)+ groups.delete(:logged_in_users)groups.push(group.name)expect(body["extras"]["visible_group_names"]).to contain_exactly(*groups.map(&:to_s))@@ -2749,6 +2759,8 @@ RSpec.describe GroupsController doexpected_ids = Group::AUTO_GROUPS.map { |name, id| id }expected_ids.delete(Group::AUTO_GROUPS[:everyone])+ expected_ids.delete(Group::AUTO_GROUPS[:logged_in_users])+ expected_ids.delete(Group::AUTO_GROUPS[:anonymous])expected_ids << group.idexpect(groups.map { |group| group["id"] }).to contain_exactly(*expected_ids)@@ -2801,6 +2813,26 @@ RSpec.describe GroupsController doexpect(groups.map { |group| group["id"] }).to contain_exactly(group.id, hidden_group.id)+ get "/groups/search.json"++ expect(response.status).to eq(200)+ groups = response.parsed_body++ automatic_ids = Group::AUTO_GROUPS.map { |name, id| id }++ expect(groups.map { |group| group["id"] }).to contain_exactly(+ group.id,+ hidden_group.id,+ *(+ automatic_ids -+ [+ Group::AUTO_GROUPS[:everyone],+ Group::AUTO_GROUPS[:anonymous],+ Group::AUTO_GROUPS[:logged_in_users],+ ]+ ),+ )+get "/groups/search.json?include_everyone=true"expect(response.status).to eq(200)@@ -2808,6 +2840,17 @@ RSpec.describe GroupsController doautomatic_ids = Group::AUTO_GROUPS.map { |name, id| id }+ expect(groups.map { |group| group["id"] }).to contain_exactly(+ group.id,+ hidden_group.id,+ *(automatic_ids - [Group::AUTO_GROUPS[:anonymous], Group::AUTO_GROUPS[:logged_in_users]]),+ )++ get "/groups/search.json?include_pseudogroups=true"++ expect(response.status).to eq(200)+ groups = response.parsed_body+expect(groups.map { |group| group["id"] }).to contain_exactly(group.id,hidden_group.id,diff --git a/spec/services/anonymous_shadow_creator_spec.rb b/spec/services/anonymous_shadow_creator_spec.rbindex 715fe676487..178a8a31c43 100644--- a/spec/services/anonymous_shadow_creator_spec.rb+++ b/spec/services/anonymous_shadow_creator_spec.rb@@ -54,7 +54,7 @@ RSpec.describe AnonymousShadowCreator doexpect(shadow.id).to eq(shadow2.id)expect(shadow.trust_level).to eq(1)- expect(shadow.username).to eq("anonymous")+ expect(shadow.username).to eq("anonymous1")expect(shadow.created_at).not_to eq_time(user.created_at)@@ -87,7 +87,7 @@ RSpec.describe AnonymousShadowCreator doshadow = AnonymousShadowCreator.get(user)- expect(shadow.username).to eq("anonymous")+ expect(shadow.username).to eq("anonymous1")endendend