Fix tests
This commit is contained in:
parent
df3d476403
commit
78dad4cf32
|
@ -468,7 +468,11 @@ class Project < ActiveRecord::Base
|
|||
end
|
||||
|
||||
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
|
||||
|
||||
def repository_storage_path
|
||||
|
|
|
@ -226,8 +226,8 @@
|
|||
Enabled Auto DevOps (Beta) for projects by default
|
||||
.help-block
|
||||
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('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size')
|
||||
= link_to icon('question-circle'), help_page_path('topics/autodevops/index.md')
|
||||
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
|
|
|
@ -14,6 +14,6 @@ ActiveSupport::Inflector.inflections do |inflect|
|
|||
award_emoji
|
||||
project_statistics
|
||||
system_note_metadata
|
||||
project_auto_devops
|
||||
auto_devops
|
||||
)
|
||||
end
|
||||
|
|
|
@ -50,7 +50,7 @@ project_tree:
|
|||
- :push_event_payload
|
||||
- :stages
|
||||
- :statuses
|
||||
- :project_auto_devops
|
||||
- :auto_devops
|
||||
- :triggers
|
||||
- :pipeline_schedules
|
||||
- :services
|
||||
|
|
|
@ -14,6 +14,7 @@ module Gitlab
|
|||
create_access_levels: 'ProtectedTag::CreateAccessLevel',
|
||||
labels: :project_labels,
|
||||
priorities: :label_priorities,
|
||||
auto_devops: 'ProjectAutoDevops',
|
||||
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
|
||||
|
|
|
@ -41,5 +41,15 @@ feature "Pipelines settings" do
|
|||
checkbox = find_field('project_auto_cancel_pending_pipelines')
|
||||
expect(checkbox).to be_checked
|
||||
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
|
||||
|
|
|
@ -224,6 +224,7 @@ Ci::Pipeline:
|
|||
- lock_version
|
||||
- auto_canceled_by_id
|
||||
- pipeline_schedule_id
|
||||
- config_source
|
||||
Ci::Stage:
|
||||
- id
|
||||
- name
|
||||
|
@ -462,3 +463,7 @@ Timelog:
|
|||
- user_id
|
||||
- created_at
|
||||
- updated_at
|
||||
ProjectAutoDevops:
|
||||
- id
|
||||
- enabled
|
||||
- domain
|
||||
|
|
Loading…
Reference in New Issue