Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 3 deletions

diff --git a/spec/lib/gitlab/auth/user_access_denied_reason_spec.rb b/spec/lib/gitlab/auth/user_access_denied_reason_spec.rb
index 102d6fba97f..e5bc51edc2d 100644
--- a/spec/lib/gitlab/auth/user_access_denied_reason_spec.rb
+++ b/spec/lib/gitlab/auth/user_access_denied_reason_spec.rb
@@ -26,6 +26,7 @@ RSpec.describe Gitlab::Auth::UserAccessDeniedReason do
 
       it { is_expected.to match /must accept the Terms of Service/ }
       it { is_expected.to include(user.username) }
+      it { is_expected.to include(Gitlab.config.gitlab.url) }
     end
 
     context 'when the user is internal' do
diff --git a/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb b/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb
index e4f85243528..9cd1ef4094e 100644
--- a/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb
+++ b/spec/lib/gitlab/metrics/exporter/base_exporter_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Metrics::Exporter::BaseExporter do
-  let(:exporter) { described_class.new }
-  let(:log_filename) { File.join(Rails.root, 'log', 'sidekiq_exporter.log') }
   let(:settings) { double('settings') }
+  let(:exporter) { described_class.new(settings) }
+  let(:log_filename) { File.join(Rails.root, 'log', 'sidekiq_exporter.log') }
 
   before do
     allow_any_instance_of(described_class).to receive(:log_filename).and_return(log_filename)
diff --git a/spec/lib/gitlab/metrics/exporter/sidekiq_exporter_spec.rb b/spec/lib/gitlab/metrics/exporter/sidekiq_exporter_spec.rb
index 88c2c4a1918..75bc3ba9626 100644
--- a/spec/lib/gitlab/metrics/exporter/sidekiq_exporter_spec.rb
+++ b/spec/lib/gitlab/metrics/exporter/sidekiq_exporter_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Metrics::Exporter::SidekiqExporter do
-  let(:exporter) { described_class.new }
+  let(:exporter) { described_class.new(Settings.monitoring.sidekiq_exporter) }
 
   after do
     exporter.stop