Commit 8c4cff99 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'blackst0ne-rails5-fix-spec-models-ci-pipeline_spec-rb' into 'master'

Resolve "[Rails5] Fix spec/models/ci/pipeline_spec.rb"

Closes #46229

See merge request gitlab-org/gitlab-ce!18906
parents ce1bb129 7f6691dd
...@@ -37,12 +37,16 @@ module Ci ...@@ -37,12 +37,16 @@ module Ci
delegate :id, to: :project, prefix: true delegate :id, to: :project, prefix: true
delegate :full_path, to: :project, prefix: true delegate :full_path, to: :project, prefix: true
validates :source, exclusion: { in: %w(unknown), unless: :importing? }, on: :create
validates :sha, presence: { unless: :importing? } validates :sha, presence: { unless: :importing? }
validates :ref, presence: { unless: :importing? } validates :ref, presence: { unless: :importing? }
validates :status, presence: { unless: :importing? } validates :status, presence: { unless: :importing? }
validate :valid_commit_sha, unless: :importing? validate :valid_commit_sha, unless: :importing?
# Replace validator below with
# `validates :source, presence: { unless: :importing? }, on: :create`
# when removing Gitlab.rails5? code.
validate :valid_source, unless: :importing?, on: :create
after_create :keep_around_commits, unless: :importing? after_create :keep_around_commits, unless: :importing?
enum source: { enum source: {
...@@ -601,5 +605,11 @@ module Ci ...@@ -601,5 +605,11 @@ module Ci
project.repository.keep_around(self.sha) project.repository.keep_around(self.sha)
project.repository.keep_around(self.before_sha) project.repository.keep_around(self.before_sha)
end end
def valid_source
if source.nil? || source == "unknown"
errors.add(:source, "invalid source")
end
end
end end
end end
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