3 files changed, 23 insertions, 15 deletions
diff --git a/spec/lib/error_tracking/collector/dsn_spec.rb b/spec/lib/error_tracking/collector/dsn_spec.rb
index af55e6f20ec..3aa8719fe38 100644
--- a/spec/lib/error_tracking/collector/dsn_spec.rb
+++ b/spec/lib/error_tracking/collector/dsn_spec.rb
@@ -3,24 +3,32 @@
 require 'spec_helper'
 
 RSpec.describe ErrorTracking::Collector::Dsn do
-  describe '.build__url' do
-    let(:gitlab) do
-      double(
+  describe '.build_url' do
+    let(:setting) do
+      {
         protocol: 'https',
         https: true,
+        port: 443,
         host: 'gitlab.example.com',
-        port: '4567',
         relative_url_root: nil
-      )
+      }
     end
 
     subject { described_class.build_url('abcdef1234567890', 778) }
 
-    it 'returns a valid URL' do
-      allow(Settings).to receive(:gitlab).and_return(gitlab)
-      allow(Settings).to receive(:gitlab_on_standard_port?).and_return(false)
+    it 'returns a valid URL without explicit port' do
+      stub_config_setting(setting)
 
-      is_expected.to eq('https://abcdef1234567890@gitlab.example.com:4567/api/v4/error_tracking/collector/778')
+      is_expected.to eq('https://abcdef1234567890@gitlab.example.com/api/v4/error_tracking/collector/778')
+    end
+
+    context 'with non-standard port' do
+      it 'returns a valid URL with custom port' do
+        setting[:port] = 4567
+        stub_config_setting(setting)
+
+        is_expected.to eq('https://abcdef1234567890@gitlab.example.com:4567/api/v4/error_tracking/collector/778')
+      end
     end
   end
 end
diff --git a/spec/lib/error_tracking/collector/sentry_auth_parser_spec.rb b/spec/lib/error_tracking/collector/sentry_auth_parser_spec.rb
index 4f00b1ec654..0e4bba04baa 100644
--- a/spec/lib/error_tracking/collector/sentry_auth_parser_spec.rb
+++ b/spec/lib/error_tracking/collector/sentry_auth_parser_spec.rb
@@ -5,11 +5,11 @@ require 'spec_helper'
 RSpec.describe ErrorTracking::Collector::SentryAuthParser do
   describe '.parse' do
     let(:headers) { { 'X-Sentry-Auth' => "Sentry sentry_key=glet_1fedb514e17f4b958435093deb02048c" } }
-    let(:request) { double('request', headers: headers) }
+    let(:request) { instance_double('ActionDispatch::Request', headers: headers) }
 
     subject { described_class.parse(request) }
 
-    context 'empty headers' do
+    context 'with empty headers' do
       let(:headers) { {} }
 
       it 'fails with exception' do
@@ -17,7 +17,7 @@ RSpec.describe ErrorTracking::Collector::SentryAuthParser do
       end
     end
 
-    context 'missing sentry_key' do
+    context 'with missing sentry_key' do
       let(:headers) { { 'X-Sentry-Auth' => "Sentry foo=bar" } }
 
       it 'returns empty value for public_key' do
diff --git a/spec/lib/error_tracking/collector/sentry_request_parser_spec.rb b/spec/lib/error_tracking/collector/sentry_request_parser_spec.rb
index 06f4b64ce93..e86ee67c129 100644
--- a/spec/lib/error_tracking/collector/sentry_request_parser_spec.rb
+++ b/spec/lib/error_tracking/collector/sentry_request_parser_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe ErrorTracking::Collector::SentryRequestParser do
 
     let(:body) { raw_event }
     let(:headers) { { 'Content-Encoding' => '' } }
-    let(:request) { double('request', headers: headers, body: StringIO.new(body)) }
+    let(:request) { instance_double('ActionDispatch::Request', headers: headers, body: StringIO.new(body)) }
 
     subject { described_class.parse(request) }
 
@@ -22,7 +22,7 @@ RSpec.describe ErrorTracking::Collector::SentryRequestParser do
       end
     end
 
-    context 'empty body content' do
+    context 'with empty body content' do
       let(:body) { '' }
 
       it 'fails with exception' do
@@ -30,7 +30,7 @@ RSpec.describe ErrorTracking::Collector::SentryRequestParser do
       end
     end
 
-    context 'plain text sentry request' do
+    context 'with plain text sentry request' do
       it_behaves_like 'valid parser'
     end
   end