From 6d31b8f052d30b7e55128d17b66bceed8c6065a9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 12 Nov 2019 18:06:57 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/models/application_setting_spec.rb | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'spec/models/application_setting_spec.rb') diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index 9d3f5b4b132..4aa8f2d959d 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -82,22 +82,6 @@ describe ApplicationSetting do it { is_expected.to allow_value(nil).for(:snowplow_iglu_registry_url) } end - context 'when pendo is enabled' do - before do - setting.pendo_enabled = true - end - - it { is_expected.not_to allow_value(nil).for(:pendo_url) } - it { is_expected.to allow_value(http).for(:pendo_url) } - it { is_expected.to allow_value(https).for(:pendo_url) } - it { is_expected.not_to allow_value(ftp).for(:pendo_url) } - it { is_expected.not_to allow_value('http://127.0.0.1').for(:pendo_url) } - end - - context 'when pendo is not enabled' do - it { is_expected.to allow_value(nil).for(:pendo_url) } - end - context "when user accepted let's encrypt terms of service" do before do setting.update(lets_encrypt_terms_of_service_accepted: true) -- cgit v1.2.1