Merge branch 'ajk-remove-jira-imports-resolver' into 'master'

Remove jira imports resolver

See merge request gitlab-org/gitlab!48337

app/graphql/types/project_type.rb

@@ -238,8 +238,7 @@ module Types
     field :jira_imports,
           Types::JiraImportType.connection_type,
           null: true,
-          description: 'Jira imports into the project',
-          resolver: Resolvers::Projects::JiraImportsResolver
+          description: 'Jira imports into the project'
 
     field :services,
           Types::Projects::ServiceType.connection_type,

spec/graphql/resolvers/projects/jira_imports_resolver_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Resolvers::Projects::JiraImportsResolver do
-  include GraphqlHelpers
-
-  specify do
-    expect(described_class).to have_nullable_graphql_type(Types::JiraImportType.connection_type)
-  end
-
-  describe '#resolve' do
-    let_it_be(:user) { create(:user) }
-    let_it_be(:project, reload: true) { create(:project, :public) }
-
-    context 'when project does not have Jira imports' do
-      let(:current_user) { user }
-
-      context 'when user cannot read Jira imports' do
-        context 'when anonymous user' do
-          let(:current_user) { nil }
-
-          it_behaves_like 'no Jira import access'
-        end
-      end
-
-      context 'when user can read Jira import data' do
-        before do
-          project.add_guest(user)
-        end
-
-        it_behaves_like 'no Jira import data present'
-
-        it 'does not raise access error' do
-          expect do
-            resolve_imports
-          end.not_to raise_error
-        end
-      end
-    end
-
-    context 'when project has Jira imports' do
-      let_it_be(:current_user) { user }
-      let_it_be(:jira_import1) { create(:jira_import_state, :finished, project: project, jira_project_key: 'AA', created_at: 2.days.ago) }
-      let_it_be(:jira_import2) { create(:jira_import_state, :finished, project: project, jira_project_key: 'BB', created_at: 5.days.ago) }
-
-      context 'when user cannot read Jira imports' do
-        context 'when anonymous user' do
-          let(:current_user) { nil }
-
-          it_behaves_like 'no Jira import access'
-        end
-      end
-
-      context 'when user can access Jira imports' do
-        before do
-          project.add_guest(user)
-        end
-
-        it 'returns Jira imports sorted ascending by created_at time' do
-          imports = resolve_imports
-
-          expect(imports.size).to eq 2
-          expect(imports.map(&:jira_project_key)).to eq %w(BB AA)
-        end
-      end
-    end
-  end
-
-  def resolve_imports(args = {}, context = { current_user: current_user })
-    resolve(described_class, obj: project, args: args, ctx: context)
-  end
-end

spec/graphql/types/project_type_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe GitlabSchema.types['Project'] do
+  include GraphqlHelpers
+
   specify { expect(described_class).to expose_permissions_using(Types::PermissionTypes::Project) }
 
   specify { expect(described_class.graphql_name).to eq('Project') }
@@ -163,4 +165,25 @@ RSpec.describe GitlabSchema.types['Project'] do
   end
 
   it_behaves_like 'a GraphQL type with labels'
+
+  describe 'jira_imports' do
+    subject { resolve_field(:jira_imports, project) }
+
+    let_it_be(:project) { create(:project, :public) }
+
+    context 'when project has Jira imports' do
+      let_it_be(:jira_import1) { create(:jira_import_state, :finished, project: project, jira_project_key: 'AA', created_at: 2.days.ago) }
+      let_it_be(:jira_import2) { create(:jira_import_state, :finished, project: project, jira_project_key: 'BB', created_at: 5.days.ago) }
+
+      it 'retrieves the imports' do
+        expect(subject).to contain_exactly(jira_import1, jira_import2)
+      end
+    end
+
+    context 'when project does not have Jira imports' do
+      it 'returns an empty result' do
+        expect(subject).to be_empty
+      end
+    end
+  end
 end

spec/support/helpers/graphql_helpers.rb

@@ -126,7 +126,7 @@ module GraphqlHelpers
                     schema: GitlabSchema,
                     query: GraphQL::Query.new(GitlabSchema),
                     parent: nil)
-    field = described_class.fields[name]
+    field = described_class.fields[::GraphqlHelpers.fieldnamerize(name)]
     instance = described_class.authorized_new(object, context)
     field.resolve_field(instance, {}, context)
   end