Add latest changes from gitlab-org/gitlab@master

1 files changed, 28 insertions, 0 deletions

diff --git a/spec/features/sentry_js_spec.rb b/spec/features/sentry_js_spec.rb
new file mode 100644
index 00000000000..b39c4f0a0ae
--- /dev/null
+++ b/spec/features/sentry_js_spec.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Sentry' do
+  let(:sentry_path) { '/sentry.chunk.js' }
+
+  it 'does not load sentry if sentry is disabled' do
+    allow(Gitlab.config.sentry).to receive(:enabled).and_return(false)
+    visit new_user_session_path
+
+    expect(has_requested_sentry).to eq(false)
+  end
+
+  it 'loads sentry if sentry is enabled' do
+    stub_sentry_settings
+
+    visit new_user_session_path
+
+    expect(has_requested_sentry).to eq(true)
+  end
+
+  def has_requested_sentry
+    page.all('script', visible: false).one? do |elm|
+      elm[:src] =~ /#{sentry_path}$/
+    end
+  end
+end