Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/lib/error_tracking/collector/dsn_spec.rb b/spec/lib/error_tracking/collector/dsn_spec.rb
new file mode 100644
index 00000000000..af55e6f20ec
--- /dev/null
+++ b/spec/lib/error_tracking/collector/dsn_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ErrorTracking::Collector::Dsn do
+  describe '.build__url' do
+    let(:gitlab) do
+      double(
+        protocol: 'https',
+        https: true,
+        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)
+
+      is_expected.to eq('https://abcdef1234567890@gitlab.example.com:4567/api/v4/error_tracking/collector/778')
+    end
+  end
+end