Read about our upcoming Code of Conduct on this issue

Unverified Commit 78dad4cf authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg
Browse files

Fix tests

parent 565baf5aa6bb
...@@ -468,7 +468,11 @@ def lfs_enabled? ...@@ -468,7 +468,11 @@ def lfs_enabled?
end end
def auto_devops_enabled? def auto_devops_enabled?
auto_devops&.enabled? || current_application_settings.auto_devops_enabled? if auto_devops
auto_devops.enabled?
else
current_application_settings.auto_devops_enabled?
end
end end
def repository_storage_path def repository_storage_path
......
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
Enabled Auto DevOps (Beta) for projects by default Enabled Auto DevOps (Beta) for projects by default
.help-block .help-block
It will automatically build, test, and deploy applications based on a predefined CI/CD configuration It will automatically build, test, and deploy applications based on a predefined CI/CD configuration
- # Fix this link = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md')
= link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size')
.form-group .form-group
.col-sm-offset-2.col-sm-10 .col-sm-offset-2.col-sm-10
.checkbox .checkbox
......
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
award_emoji award_emoji
project_statistics project_statistics
system_note_metadata system_note_metadata
project_auto_devops auto_devops
) )
end end
...@@ -50,7 +50,7 @@ project_tree: ...@@ -50,7 +50,7 @@ project_tree:
- :push_event_payload - :push_event_payload
- :stages - :stages
- :statuses - :statuses
- :project_auto_devops - :auto_devops
- :triggers - :triggers
- :pipeline_schedules - :pipeline_schedules
- :services - :services
......
...@@ -14,6 +14,7 @@ class RelationFactory ...@@ -14,6 +14,7 @@ class RelationFactory
create_access_levels: 'ProtectedTag::CreateAccessLevel', create_access_levels: 'ProtectedTag::CreateAccessLevel',
labels: :project_labels, labels: :project_labels,
priorities: :label_priorities, priorities: :label_priorities,
auto_devops: 'ProjectAutoDevops',
label: :project_label }.freeze label: :project_label }.freeze
USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id].freeze USER_REFERENCES = %w[author_id assignee_id updated_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id].freeze
......
...@@ -41,5 +41,15 @@ ...@@ -41,5 +41,15 @@
checkbox = find_field('project_auto_cancel_pending_pipelines') checkbox = find_field('project_auto_cancel_pending_pipelines')
expect(checkbox).to be_checked expect(checkbox).to be_checked
end end
scenario 'update auto devops settings' do
fill_in('project_auto_devops_attributes_domain', with: 'test.com')
page.choose('project_auto_devops_attributes_enabled_false')
click_on 'Save changes'
expect(page.status_code).to eq(200)
expect(project.auto_devops).to be_present
expect(project.auto_devops).not_to be_enabled
end
end end
end end
...@@ -224,6 +224,7 @@ Ci::Pipeline: ...@@ -224,6 +224,7 @@ Ci::Pipeline:
- lock_version - lock_version
- auto_canceled_by_id - auto_canceled_by_id
- pipeline_schedule_id - pipeline_schedule_id
- config_source
Ci::Stage: Ci::Stage:
- id - id
- name - name
...@@ -462,3 +463,7 @@ Timelog: ...@@ -462,3 +463,7 @@ Timelog:
- user_id - user_id
- created_at - created_at
- updated_at - updated_at
ProjectAutoDevops:
- id
- enabled
- domain
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment