Add latest changes from gitlab-org/gitlab@master

1 files changed, 39 insertions, 4 deletions

diff --git a/spec/lib/sentry/client/issue_spec.rb b/spec/lib/sentry/client/issue_spec.rb
index b5ee5063e86..f4796a27b4d 100644
--- a/spec/lib/sentry/client/issue_spec.rb
+++ b/spec/lib/sentry/client/issue_spec.rb
@@ -6,7 +6,9 @@ describe Sentry::Client::Issue do
   include SentryClientHelpers
 
   let(:token) { 'test-token' }
+  let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0' }
   let(:client) { Sentry::Client.new(sentry_url, token) }
+  let(:issue_id) { 503504 }
 
   describe '#list_issues' do
     shared_examples 'issues have correct return type' do |klass|
@@ -225,15 +227,11 @@ describe Sentry::Client::Issue do
       )
     end
 
-    let(:issue_id) { 503504 }
-    let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0' }
     let(:sentry_request_url) { "#{sentry_url}/issues/#{issue_id}/" }
     let!(:sentry_api_request) { stub_sentry_request(sentry_request_url, body: issue_sample_response) }
 
     subject { client.issue_details(issue_id: issue_id) }
 
-    it_behaves_like 'calls sentry api'
-
     it 'escapes issue ID' do
       allow(CGI).to receive(:escape).and_call_original
 
@@ -290,4 +288,41 @@ describe Sentry::Client::Issue do
       end
     end
   end
+
+  describe '#update_issue' do
+    let(:sentry_url) { 'https://sentrytest.gitlab.com/api/0' }
+    let(:sentry_request_url) { "#{sentry_url}/issues/#{issue_id}/" }
+
+    before do
+      stub_sentry_request(sentry_request_url, :put)
+    end
+
+    let(:params) do
+      {
+        status: 'resolved'
+      }
+    end
+
+    subject { client.update_issue(issue_id: issue_id, params: params) }
+
+    it_behaves_like 'calls sentry api' do
+      let(:sentry_api_request) { stub_sentry_request(sentry_request_url, :put) }
+    end
+
+    it 'returns a truthy result' do
+      expect(subject).to be_truthy
+    end
+
+    context 'error encountered' do
+      let(:error) { StandardError.new('error') }
+
+      before do
+        allow(client).to receive(:update_issue).and_raise(error)
+      end
+
+      it 'raises the error' do
+        expect { subject }.to raise_error(error)
+      end
+    end
+  end
 end