Add latest changes from gitlab-org/gitlab@master

3 files changed, 82 insertions, 0 deletions

diff --git a/spec/lib/sentry/client/issue_link_spec.rb b/spec/lib/sentry/client/issue_link_spec.rb
new file mode 100644
index 00000000000..35a69be6de5
--- /dev/null
+++ b/spec/lib/sentry/client/issue_link_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Sentry::Client::IssueLink do
+  include SentryClientHelpers
+
+  let(:error_tracking_setting) { create(:project_error_tracking_setting, api_url: sentry_url) }
+  let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0/projects/sentry-org/sentry-project' }
+  let(:client) { error_tracking_setting.sentry_client }
+
+  let(:issue_link_sample_response) { JSON.parse(fixture_file('sentry/issue_link_sample_response.json')) }
+
+  describe '#create_issue_link' do
+    let(:integration_id) { 44444 }
+    let(:sentry_issue_id) { 11111111 }
+    let(:issue) { create(:issue, project: error_tracking_setting.project) }
+
+    let(:sentry_issue_link_url) { "https://sentrytest.gitlab.com/api/0/groups/#{sentry_issue_id}/integrations/#{integration_id}/" }
+    let(:sentry_api_response) { issue_link_sample_response }
+    let!(:sentry_api_request) { stub_sentry_request(sentry_issue_link_url, :put, body: sentry_api_response, status: 201) }
+
+    subject { client.create_issue_link(integration_id, sentry_issue_id, issue) }
+
+    it_behaves_like 'calls sentry api'
+
+    it { is_expected.to be_present }
+
+    context 'redirects' do
+      let(:sentry_api_url) { sentry_issue_link_url }
+
+      it_behaves_like 'no Sentry redirects', :put
+    end
+
+    context 'when exception is raised' do
+      let(:sentry_request_url) { sentry_issue_link_url }
+
+      it_behaves_like 'maps Sentry exceptions', :put
+    end
+  end
+end
diff --git a/spec/lib/sentry/client/repo_spec.rb b/spec/lib/sentry/client/repo_spec.rb
new file mode 100644
index 00000000000..7bc2811ef03
--- /dev/null
+++ b/spec/lib/sentry/client/repo_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Sentry::Client::Repo do
+  include SentryClientHelpers
+
+  let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0/projects/sentry-org/sentry-project' }
+  let(:token) { 'test-token' }
+  let(:client) { Sentry::Client.new(sentry_url, token) }
+  let(:repos_sample_response) { JSON.parse(fixture_file('sentry/repos_sample_response.json')) }
+
+  describe '#repos' do
+    let(:organization_slug) { 'gitlab' }
+    let(:sentry_repos_url) { "https://sentrytest.gitlab.com/api/0/organizations/#{organization_slug}/repos/" }
+    let(:sentry_api_response) { repos_sample_response }
+    let!(:sentry_api_request) { stub_sentry_request(sentry_repos_url, body: sentry_api_response) }
+
+    subject { client.repos(organization_slug) }
+
+    it_behaves_like 'calls sentry api'
+
+    it { is_expected.to all( be_a(Gitlab::ErrorTracking::Repo)) }
+
+    it { expect(subject.length).to eq(1) }
+
+    context 'redirects' do
+      let(:sentry_api_url) { sentry_repos_url }
+
+      it_behaves_like 'no Sentry redirects'
+    end
+
+    context 'when exception is raised' do
+      let(:sentry_request_url) { sentry_repos_url }
+
+      it_behaves_like 'maps Sentry exceptions'
+    end
+  end
+end
diff --git a/spec/lib/sentry/client_spec.rb b/spec/lib/sentry/client_spec.rb
index 409e8be3198..e2da4564ca1 100644
--- a/spec/lib/sentry/client_spec.rb
+++ b/spec/lib/sentry/client_spec.rb
@@ -12,4 +12,6 @@ describe Sentry::Client do
   it { is_expected.to respond_to :list_issues }
   it { is_expected.to respond_to :issue_details }
   it { is_expected.to respond_to :issue_latest_event }
+  it { is_expected.to respond_to :repos }
+  it { is_expected.to respond_to :create_issue_link }
 end