diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-05-31 21:17:30 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-31 21:17:30 +0300 |
commit | 9209736a22501dd4ea16afee86d0968bead84100 (patch) | |
tree | b2a6db95d89af260af1b2f4fd404137565bbfd23 /spec | |
parent | b9798c157ac5973e9dd2b7ad95267014034a219f (diff) | |
parent | bfed231152fa476aa4be6e221d65dc5225d19537 (diff) |
Merge branch '56959-drop-project_auto_devops_domain' into 'master'
Removes project_auto_devops#domain column
Closes #56959
See merge request gitlab-org/gitlab-ce!28574
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/settings/ci_cd_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/factories/project_auto_devops.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb index db53e5bc8a4..b91a4df40a5 100644 --- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb +++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb @@ -109,7 +109,7 @@ describe Projects::Settings::CiCdController do end context 'when updating the auto_devops settings' do - let(:params) { { auto_devops_attributes: { enabled: '', domain: 'mepmep.md' } } } + let(:params) { { auto_devops_attributes: { enabled: '' } } } context 'following the instance default' do let(:params) { { auto_devops_attributes: { enabled: '' } } } diff --git a/spec/factories/project_auto_devops.rb b/spec/factories/project_auto_devops.rb index 75ac7cc7687..1de42512402 100644 --- a/spec/factories/project_auto_devops.rb +++ b/spec/factories/project_auto_devops.rb @@ -2,7 +2,6 @@ FactoryBot.define do factory :project_auto_devops do project enabled true - domain "example.com" deploy_strategy :continuous trait :continuous_deployment do |