diff --git a/app/graphql/types/ci/runner_membership_filter_enum.rb b/app/graphql/types/ci/runner_membership_filter_enum.rb index eb691166944a90403ea3b7b747c880d480c80f66..439e2b984cc60c2a89542700986941a7285e8887 100644 --- a/app/graphql/types/ci/runner_membership_filter_enum.rb +++ b/app/graphql/types/ci/runner_membership_filter_enum.rb @@ -4,8 +4,7 @@ module Types module Ci class RunnerMembershipFilterEnum < BaseEnum graphql_name 'CiRunnerMembershipFilter' - description 'Values for filtering runners in namespaces. ' \ - 'The previous type name `RunnerMembershipFilter` was deprecated in 15.4.' + description 'Values for filtering runners in namespaces.' value 'DIRECT', description: "Include runners that have a direct relationship.", diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index c418eea251e5b000d24c3dc86eb696b77534456f..2cc66ad04935838d1a9890fdb60c16c97d439a55 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -32010,7 +32010,7 @@ Runner cloud provider. ### `CiRunnerMembershipFilter` -Values for filtering runners in namespaces. The previous type name `RunnerMembershipFilter` was deprecated in 15.4. +Values for filtering runners in namespaces. | Value | Description | | ----- | ----------- | diff --git a/ee/spec/requests/api/graphql/ci/runners_spec.rb b/ee/spec/requests/api/graphql/ci/runners_spec.rb index 5e0ebbd9f55327b037593c29b83bec8dcb1d1615..fe02caf118ff938cf4c9248acd8705a1bfd6a8ff 100644 --- a/ee/spec/requests/api/graphql/ci/runners_spec.rb +++ b/ee/spec/requests/api/graphql/ci/runners_spec.rb @@ -54,10 +54,11 @@ let_it_be(:group_runner) { create(:ci_runner, :group, groups: [group]) } let_it_be(:sub_group_runner) { create(:ci_runner, :group, groups: [sub_group]) } - let(:runner_ids) { graphql_data['group']['runners']['nodes'].map { |n| n['id'] } } + let(:actual_runner_ids) { graphql_data_at(:group, :runners, :nodes).map { |n| n['id'] } } + let(:expected_runner_ids) { [group_runner, sub_group_runner].map { |g| g.to_global_id.to_s } } let(:query) do %( - query getGroupRunners($membership: #{membership_graphql_type}) { + query getGroupRunners($membership: CiRunnerMembershipFilter) { group(fullPath: "#{group.full_path}") { runners(membership: $membership) { nodes { @@ -73,21 +74,7 @@ post_graphql(query, current_user: current_user) end - context 'with deprecated RunnerMembershipFilter enum type' do - let(:membership_graphql_type) { 'RunnerMembershipFilter' } - - it 'returns ids of expected runners' do - expect(runner_ids).to match_array([group_runner, sub_group_runner].map { |g| g.to_global_id.to_s }) - end - end - - context 'with new CiRunnerMembershipFilter enum type' do - let(:membership_graphql_type) { 'CiRunnerMembershipFilter' } - - it 'returns ids of expected runners' do - expect(runner_ids).to match_array([group_runner, sub_group_runner].map { |g| g.to_global_id.to_s }) - end - end + it { expect(actual_runner_ids).to match_array(expected_runner_ids) } end context 'when sorting by MOST_ACTIVE_DESC' do diff --git a/lib/gitlab/graphql/type_name_deprecations.rb b/lib/gitlab/graphql/type_name_deprecations.rb index b06749df26958c63e3de56e55d551d8f5336f1ff..34f7e16e515cf27d8bf8a5def77e0414c7971731 100644 --- a/lib/gitlab/graphql/type_name_deprecations.rb +++ b/lib/gitlab/graphql/type_name_deprecations.rb @@ -11,11 +11,7 @@ module TypeNameDeprecations # old_name: 'RunnerMembershipFilter', new_name: 'CiRunnerMembershipFilter', milestone: '15.4' # ) # ].freeze - DEPRECATIONS = [ - Gitlab::Graphql::DeprecationsBase::NameDeprecation.new( - old_name: 'RunnerMembershipFilter', new_name: 'CiRunnerMembershipFilter', milestone: '15.4' - ) - ].freeze + DEPRECATIONS = [].freeze def self.map_graphql_name(name) name