diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-01 23:30:13 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-01 23:30:13 +0000 |
| commit | 97d3e170a20b54128f74e03df984cc51c4dfe6d2 (patch) | |
| tree | 6df7be0ee22520bfb32f5198dbd7188d31ebaa5b /spec | |
| parent | f5998875e5d697d421446ccd59938c583b54dee0 (diff) | |
| parent | 1746f154c580915be7352dfbf0b809d42b07a32a (diff) | |
| download | gitlab-ce-97d3e170a20b54128f74e03df984cc51c4dfe6d2.tar.gz | |
Merge branch 'da-sentry-client-side-settings' into 'master'
Allow Sentry client-side DSN to be passed on gitlab.yml
See merge request gitlab-org/gitlab-ce!27967
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/shared_examples/application_setting_examples.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/support/shared_examples/application_setting_examples.rb b/spec/support/shared_examples/application_setting_examples.rb index d8f7ba1185e..421303c97be 100644 --- a/spec/support/shared_examples/application_setting_examples.rb +++ b/spec/support/shared_examples/application_setting_examples.rb @@ -260,6 +260,7 @@ RSpec.shared_examples 'application settings examples' do allow(Gitlab.config.sentry).to receive(:enabled).and_return(false) allow(Gitlab.config.sentry).to receive(:dsn).and_return(nil) + allow(Gitlab.config.sentry).to receive(:clientside_dsn).and_return(nil) expect(setting.sentry_enabled).to eq true expect(setting.sentry_dsn).to eq 'https://b44a0828b72421a6d8e99efd68d44fa8@example.com/40' @@ -277,12 +278,13 @@ RSpec.shared_examples 'application settings examples' do allow(Gitlab.config.sentry).to receive(:enabled).and_return(true) allow(Gitlab.config.sentry).to receive(:dsn).and_return('https://b44a0828b72421a6d8e99efd68d44fa8@example.com/42') + allow(Gitlab.config.sentry).to receive(:clientside_dsn).and_return('https://b44a0828b72421a6d8e99efd68d44fa8@example.com/43') expect(setting).not_to receive(:read_attribute) expect(setting.sentry_enabled).to eq true expect(setting.sentry_dsn).to eq 'https://b44a0828b72421a6d8e99efd68d44fa8@example.com/42' expect(setting.clientside_sentry_enabled).to eq true - expect(setting.clientside_sentry_dsn). to eq 'https://b44a0828b72421a6d8e99efd68d44fa8@example.com/42' + expect(setting.clientside_sentry_dsn). to eq 'https://b44a0828b72421a6d8e99efd68d44fa8@example.com/43' end end end |