Add latest changes from gitlab-org/gitlab@master

3 files changed, 100 insertions, 2 deletions

diff --git a/spec/graphql/resolvers/error_tracking/sentry_detailed_error_resolver_spec.rb b/spec/graphql/resolvers/error_tracking/sentry_detailed_error_resolver_spec.rb
new file mode 100644
index 00000000000..5e7f18636ec
--- /dev/null
+++ b/spec/graphql/resolvers/error_tracking/sentry_detailed_error_resolver_spec.rb
@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Resolvers::ErrorTracking::SentryDetailedErrorResolver do
+  include GraphqlHelpers
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:current_user) { create(:user) }
+
+  let(:issue_details_service) { spy('ErrorTracking::IssueDetailsService') }
+
+  before do
+    project.add_developer(current_user)
+
+    allow(ErrorTracking::IssueDetailsService)
+      .to receive(:new)
+      .and_return issue_details_service
+  end
+
+  describe '#resolve' do
+    let(:args) { { id: issue_global_id(1234) } }
+    it 'fetches the data via the sentry API' do
+      resolve_error(args)
+
+      expect(issue_details_service).to have_received(:execute)
+    end
+
+    context 'error matched' do
+      let(:detailed_error) { build(:detailed_error_tracking_error) }
+
+      before do
+        allow(issue_details_service).to receive(:execute)
+          .and_return({ issue: detailed_error })
+      end
+
+      it 'resolves to a detailed error' do
+        expect(resolve_error(args)).to eq detailed_error
+      end
+
+      it 'assigns the gitlab project' do
+        expect(resolve_error(args).gitlab_project).to eq project
+      end
+    end
+
+    it 'resolves to nil if no match' do
+      allow(issue_details_service).to receive(:execute)
+        .and_return({ issue: nil })
+
+      result = resolve_error(args)
+      expect(result).to eq nil
+    end
+  end
+
+  def resolve_error(args = {}, context = { current_user: current_user })
+    resolve(described_class, obj: project, args: args, ctx: context)
+  end
+
+  def issue_global_id(issue_id)
+    Gitlab::ErrorTracking::DetailedError.new(id: issue_id).to_global_id.to_s
+  end
+end
diff --git a/spec/graphql/types/error_tracking/sentry_detailed_error_type_spec.rb b/spec/graphql/types/error_tracking/sentry_detailed_error_type_spec.rb
new file mode 100644
index 00000000000..3576adb5272
--- /dev/null
+++ b/spec/graphql/types/error_tracking/sentry_detailed_error_type_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe GitlabSchema.types['SentryDetailedError'] do
+  it { expect(described_class.graphql_name).to eq('SentryDetailedError') }
+
+  it { expect(described_class).to require_graphql_authorizations(:read_sentry_issue) }
+
+  it 'exposes the expected fields' do
+    expected_fields = %i[
+      id
+      sentryId
+      title
+      type
+      userCount
+      count
+      firstSeen
+      lastSeen
+      message
+      culprit
+      externalUrl
+      sentryProjectId
+      sentryProjectName
+      sentryProjectSlug
+      shortId
+      status
+      frequency
+      firstReleaseLastCommit
+      lastReleaseLastCommit
+      firstReleaseShortVersion
+      lastReleaseShortVersion
+    ]
+
+    is_expected.to have_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/project_type_spec.rb b/spec/graphql/types/project_type_spec.rb
index 19a433f090e..8a697b1bcae 100644
--- a/spec/graphql/types/project_type_spec.rb
+++ b/spec/graphql/types/project_type_spec.rb
@@ -22,8 +22,7 @@ describe GitlabSchema.types['Project'] do
       only_allow_merge_if_pipeline_succeeds request_access_enabled
       only_allow_merge_if_all_discussions_are_resolved printing_merge_request_link_enabled
       namespace group statistics repository merge_requests merge_request issues
-      issue pipelines
-      removeSourceBranchAfterMerge
+      issue pipelines removeSourceBranchAfterMerge sentryDetailedError
     ]
 
     is_expected.to have_graphql_fields(*expected_fields)