Skip to content
代码片段 群组 项目
提交 8f632b88 编辑于 作者: Furkan Ayhan's avatar Furkan Ayhan
浏览文件

Merge branch 'remove-before-validation-from-generic-commit-status' into 'master'

Removes set_default_values from GenericCommitStatus

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104714



Merged-by: default avatarFurkan Ayhan <furkanayhn@gmail.com>
Approved-by: default avatarMax Orefice <morefice@gitlab.com>
Approved-by: default avatarFurkan Ayhan <furkanayhn@gmail.com>
Co-authored-by: default avatarLaura Montemayor <lmontemayor@gitlab.com>
No related branches found
No related tags found
无相关合并请求
......@@ -3,8 +3,6 @@
class GenericCommitStatus < CommitStatus
EXTERNAL_STAGE_IDX = 1_000_000
before_validation :set_default_values
validates :target_url, addressable_url: true,
length: { maximum: 255 },
allow_nil: true
......@@ -13,12 +11,6 @@ class GenericCommitStatus < CommitStatus
# GitHub compatible API
alias_attribute :context, :name
def set_default_values
self.context ||= 'default'
self.stage ||= 'external'
self.stage_idx ||= EXTERNAL_STAGE_IDX
end
def tags
[:external]
end
......
......@@ -125,7 +125,8 @@ class CommitStatuses < ::API::Base
user: current_user,
protected: user_project.protected_for?(ref),
ci_stage: stage,
stage_idx: stage.position
stage_idx: stage.position,
stage: 'external'
)
updatable_optional_attributes = %w[target_url description coverage]
......
......@@ -20,7 +20,7 @@
end
describe '#name_uniqueness_across_types' do
let(:attributes) { {} }
let(:attributes) { { context: 'default' } }
let(:commit_status) { described_class.new(attributes) }
let(:status_name) { 'test-job' }
......@@ -39,7 +39,7 @@
end
context 'with only a pipeline' do
let(:attributes) { { pipeline: pipeline } }
let(:attributes) { { pipeline: pipeline, context: 'default' } }
context 'without name' do
it_behaves_like 'it does not have uniqueness errors'
......@@ -129,32 +129,6 @@
end
end
describe 'set_default_values' do
before do
generic_commit_status.context = nil
generic_commit_status.stage = nil
generic_commit_status.save!
end
describe '#context' do
subject { generic_commit_status.context }
it { is_expected.not_to be_nil }
end
describe '#stage' do
subject { generic_commit_status.stage }
it { is_expected.not_to be_nil }
end
describe '#stage_idx' do
subject { generic_commit_status.stage_idx }
it { is_expected.not_to be_nil }
end
end
describe '#present' do
subject { generic_commit_status.present }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册