diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-08-10 16:37:19 +0100 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-08-13 10:52:42 +0100 |
commit | 6cfe3e71d497e31d675cc7ecb5a5cb572d77d8c9 (patch) | |
tree | 419046ca07283cf89a6d1edc9e2ca66ce48c813d | |
parent | 9e5d476f6396875d3f7cb7a95c9fe63a850495fb (diff) | |
download | gitlab-ce-6cfe3e71d497e31d675cc7ecb5a5cb572d77d8c9.tar.gz |
Fix logic in spec in spec/models/project_auto_devops_spec.rb
-rw-r--r-- | app/models/project_auto_devops.rb | 6 | ||||
-rw-r--r-- | spec/models/project_auto_devops_spec.rb | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/app/models/project_auto_devops.rb b/app/models/project_auto_devops.rb index 155400d1a43..dc6736dd9cd 100644 --- a/app/models/project_auto_devops.rb +++ b/app/models/project_auto_devops.rb @@ -47,12 +47,8 @@ class ProjectAutoDevops < ActiveRecord::Base end def needs_to_create_deploy_token? - auto_devops_enabled? && + project.auto_devops_enabled? && !project.public? && !project.deploy_tokens.find_by(name: DeployToken::GITLAB_DEPLOY_TOKEN_NAME).present? end - - def auto_devops_enabled? - Gitlab::CurrentSettings.auto_devops_enabled? || enabled? - end end diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb index 749b2094787..797d767465a 100644 --- a/spec/models/project_auto_devops_spec.rb +++ b/spec/models/project_auto_devops_spec.rb @@ -100,7 +100,7 @@ describe ProjectAutoDevops do end end - describe '#set_gitlab_deploy_token' do + describe '#create_gitlab_deploy_token' do let(:auto_devops) { build(:project_auto_devops, project: project) } context 'when the project is public' do @@ -144,9 +144,9 @@ describe ProjectAutoDevops do end end - context 'when autodevops is enabled at instancel level' do + context 'when autodevops is enabled at instance level' do let(:project) { create(:project, :repository, :internal) } - let(:auto_devops) { build(:project_auto_devops, :disabled, project: project) } + let(:auto_devops) { build(:project_auto_devops, enabled: nil, project: project) } it 'should create a deploy token' do allow(Gitlab::CurrentSettings).to receive(:auto_devops_enabled?).and_return(true) |