Merge branch 'zeitwerk-fixes' into 'master'

Various fixes when loading classes

See merge request gitlab-org/gitlab!63818

.rubocop_manual_todo.yml

@@ -1588,6 +1588,7 @@ Gitlab/NamespacedClass:
     - 'app/models/list_user_preference.rb'
     - 'app/models/member.rb'
     - 'app/models/members/group_member.rb'
+    - 'app/models/members/last_group_owner_assigner.rb'
     - 'app/models/members/project_member.rb'
     - 'app/models/members_preloader.rb'
     - 'app/models/merge_request.rb'

app/models/members/last_group_owner_assigner.rb

 # frozen_string_literal: true
 
-module Members
-  class LastGroupOwnerAssigner
-    def initialize(group, members)
-      @group = group
-      @members = members
-    end
+class LastGroupOwnerAssigner
+  def initialize(group, members)
+    @group = group
+    @members = members
+  end
 
-    def execute
-      @last_blocked_owner = no_owners_in_heirarchy? && group.single_blocked_owner?
-      @group_single_owner = owners.size == 1
+  def execute
+    @last_blocked_owner = no_owners_in_heirarchy? && group.single_blocked_owner?
+    @group_single_owner = owners.size == 1
 
-      members.each { |member| set_last_owner(member) }
-    end
+    members.each { |member| set_last_owner(member) }
+  end
 
-    private
+  private
 
-    attr_reader :group, :members, :last_blocked_owner, :group_single_owner
+  attr_reader :group, :members, :last_blocked_owner, :group_single_owner
 
-    def no_owners_in_heirarchy?
-      owners.empty?
-    end
+  def no_owners_in_heirarchy?
+    owners.empty?
+  end
 
-    def set_last_owner(member)
-      member.last_owner = member.id.in?(owner_ids) && group_single_owner
-      member.last_blocked_owner = member.id.in?(blocked_owner_ids) && last_blocked_owner
-    end
+  def set_last_owner(member)
+    member.last_owner = member.id.in?(owner_ids) && group_single_owner
+    member.last_blocked_owner = member.id.in?(blocked_owner_ids) && last_blocked_owner
+  end
 
-    def owner_ids
-      @owner_ids ||= owners.where(id: member_ids).ids
-    end
+  def owner_ids
+    @owner_ids ||= owners.where(id: member_ids).ids
+  end
 
-    def blocked_owner_ids
-      @blocked_owner_ids ||= group.blocked_owners.where(id: member_ids).ids
-    end
+  def blocked_owner_ids
+    @blocked_owner_ids ||= group.blocked_owners.where(id: member_ids).ids
+  end
 
-    def member_ids
-      @members_ids ||= members.pluck(:id)
-    end
+  def member_ids
+    @members_ids ||= members.pluck(:id)
+  end
 
-    def owners
-      @owners ||= group.members_with_parents.owners.load
-    end
+  def owners
+    @owners ||= group.members_with_parents.owners.load
   end
 end

app/serializers/member_serializer.rb

@@ -4,7 +4,7 @@ class MemberSerializer < BaseSerializer
   entity MemberEntity
 
   def represent(members, opts = {})
-    Members::LastGroupOwnerAssigner.new(opts[:group], members).execute unless opts[:source].is_a?(Project)
+    LastGroupOwnerAssigner.new(opts[:group], members).execute unless opts[:source].is_a?(Project)
 
     super(members, opts)
   end

ee/lib/api/group_merge_request_approval_settings.rb

@@ -28,7 +28,7 @@ module API
 
         desc 'Update existing merge request approval setting' do
           detail 'This feature is gated by the :group_merge_request_approval_settings_feature_flag'
-          success EE::API::Entities::GroupMergeRequestApprovalSetting
+          success ::API::Entities::GroupMergeRequestApprovalSetting
         end
         params do
           optional :allow_author_approval, type: Boolean, desc: 'Allow authors to self-approve merge requests'

ee/lib/gitlab/subscription_portal/client.rb

@@ -3,7 +3,7 @@
 module Gitlab
   module SubscriptionPortal
     class Client
-      include SubscriptionPortal::Clients::REST
+      include SubscriptionPortal::Clients::Rest
       include SubscriptionPortal::Clients::Graphql
 
       ResponseError = Class.new(StandardError)

ee/lib/gitlab/subscription_portal/clients/rest.rb

@@ -3,7 +3,7 @@
 module Gitlab
   module SubscriptionPortal
     module Clients
-      module REST
+      module Rest
         extend ActiveSupport::Concern
 
         class_methods do

ee/spec/lib/gitlab/subscription_portal/client_spec.rb

@@ -6,5 +6,5 @@ RSpec.describe Gitlab::SubscriptionPortal::Client do
   subject { described_class }
 
   it { is_expected.to include_module Gitlab::SubscriptionPortal::Clients::Graphql }
-  it { is_expected.to include_module Gitlab::SubscriptionPortal::Clients::REST }
+  it { is_expected.to include_module Gitlab::SubscriptionPortal::Clients::Rest }
 end

ee/spec/lib/gitlab/subscription_portal/clients/rest_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::SubscriptionPortal::Clients::REST do
+RSpec.describe Gitlab::SubscriptionPortal::Clients::Rest do
   let(:client) { Gitlab::SubscriptionPortal::Client }
   let(:http_response) { nil }
   let(:http_method) { :post }

lib/api/entities/issue_basic.rb

@@ -23,7 +23,7 @@ module API
       expose :issue_type,
              as: :type,
              format_with: :upcase,
-             documentation: { type: "String", desc: "One of #{Issue.issue_types.keys.map(&:upcase)}" }
+             documentation: { type: "String", desc: "One of #{::Issue.issue_types.keys.map(&:upcase)}" }
 
       expose :assignee, using: ::API::Entities::UserBasic do |issue|
         issue.assignees.first

lib/gitlab/database/migration_helpers.rb

@@ -5,7 +5,7 @@ module Gitlab
     module MigrationHelpers
       include Migrations::BackgroundMigrationHelpers
       include DynamicModelHelpers
-      include Migrations::RenameTableHelpers
+      include RenameTableHelpers
 
       # https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
       MAX_IDENTIFIER_NAME_LENGTH = 63

lib/gitlab/graphql.rb → lib/gitlab/graphql/standard_graphql_error.rb

 # frozen_string_literal: true
 
+# rubocop:disable Cop/CustomErrorClass
+
 module Gitlab
   module Graphql
-    StandardGraphqlError = Class.new(StandardError)
+    class StandardGraphqlError < StandardError
+    end
   end
 end

spec/models/members/last_group_owner_assigner_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Members::LastGroupOwnerAssigner do
+RSpec.describe LastGroupOwnerAssigner do
   describe "#execute" do
     let_it_be(:user, reload: true) { create(:user) }
     let_it_be(:group) { create(:group) }

spec/serializers/member_serializer_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe MemberSerializer do
     it_behaves_like 'members.json'
 
     it 'does not invoke group owner assignment' do
-      expect(Members::LastGroupOwnerAssigner).not_to receive(:new)
+      expect(LastGroupOwnerAssigner).not_to receive(:new)
 
       representation
     end