summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-05-22 14:14:17 +1200
committerThong Kuah <tkuah@gitlab.com>2019-05-24 14:40:12 +1200
commitf2e6aec0b84357e4d755e71aae9ebafa85df3220 (patch)
tree0a2db954222cc4670cb3c024f244bb2b0dcdff33
parentf0efa2f91f8687a1cf0f39596790edaf338e8ec5 (diff)
downloadgitlab-ce-f2e6aec0b84357e4d755e71aae9ebafa85df3220.tar.gz
Remove un-used methods
These two methods were used in emitting AUTO_DEVOPS_DOMAIN which has now been dropped.
-rw-r--r--app/models/project_auto_devops.rb8
-rw-r--r--spec/models/project_auto_devops_spec.rb28
2 files changed, 0 insertions, 36 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb
index e71de1cdc65..90bcb3067f6 100644
--- a/app/models/project_auto_devops.rb
+++ b/app/models/project_auto_devops.rb
@@ -16,14 +16,6 @@ class ProjectAutoDevops < ApplicationRecord
after_save :create_gitlab_deploy_token, if: :needs_to_create_deploy_token?
- def instance_domain
- Gitlab::CurrentSettings.auto_devops_domain
- end
-
- def has_domain?
- domain.present? || instance_domain.present?
- end
-
def predefined_variables
Gitlab::Ci::Variables::Collection.new.tap do |variables|
variables.concat(deployment_strategy_default_variables)
diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb
index 5148604677c..7bdd2367a68 100644
--- a/spec/models/project_auto_devops_spec.rb
+++ b/spec/models/project_auto_devops_spec.rb
@@ -14,34 +14,6 @@ describe ProjectAutoDevops do
it { is_expected.to respond_to(:created_at) }
it { is_expected.to respond_to(:updated_at) }
- describe '#has_domain?' do
- context 'when domain is defined' do
- let(:auto_devops) { build_stubbed(:project_auto_devops, project: project, domain: 'domain.com') }
-
- it { expect(auto_devops).to have_domain }
- end
-
- context 'when domain is empty' do
- let(:auto_devops) { build_stubbed(:project_auto_devops, project: project, domain: '') }
-
- context 'when there is an instance domain specified' do
- before do
- allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return('example.com')
- end
-
- it { expect(auto_devops).to have_domain }
- end
-
- context 'when there is no instance domain specified' do
- before do
- allow(Gitlab::CurrentSettings).to receive(:auto_devops_domain).and_return(nil)
- end
-
- it { expect(auto_devops).not_to have_domain }
- end
- end
- end
-
describe '#predefined_variables' do
let(:auto_devops) { build_stubbed(:project_auto_devops, project: project, domain: domain) }