Commit 0de88f57 authored by Yorick Peterse's avatar Yorick Peterse

Merge branch '6073-extract-ee-specific-files-lines-for-some-ci-files' into 'master'

Resolve "Extract EE specific files/lines for some CI files"

Closes gitlab-ee#6073

See merge request gitlab-org/gitlab-ce!27210
parents 2238b12d e116c456
...@@ -35,7 +35,7 @@ describe Ci::RetryBuildService do ...@@ -35,7 +35,7 @@ describe Ci::RetryBuildService do
commit_id deployment erased_by_id project_id commit_id deployment erased_by_id project_id
runner_id tag_taggings taggings tags trigger_request_id runner_id tag_taggings taggings tags trigger_request_id
user_id auto_canceled_by_id retried failure_reason user_id auto_canceled_by_id retried failure_reason
artifacts_file_store artifacts_metadata_store sourced_pipelines artifacts_file_store artifacts_metadata_store
metadata runner_session trace_chunks].freeze metadata runner_session trace_chunks].freeze
shared_examples 'build duplication' do shared_examples 'build duplication' do
...@@ -95,7 +95,8 @@ describe Ci::RetryBuildService do ...@@ -95,7 +95,8 @@ describe Ci::RetryBuildService do
end end
it 'has correct number of known attributes' do it 'has correct number of known attributes' do
known_accessors = CLONE_ACCESSORS + REJECT_ACCESSORS + IGNORE_ACCESSORS processed_accessors = CLONE_ACCESSORS + REJECT_ACCESSORS
known_accessors = processed_accessors + IGNORE_ACCESSORS
# :tag_list is a special case, this accessor does not exist # :tag_list is a special case, this accessor does not exist
# in reflected associations, comes from `act_as_taggable` and # in reflected associations, comes from `act_as_taggable` and
...@@ -108,7 +109,8 @@ describe Ci::RetryBuildService do ...@@ -108,7 +109,8 @@ describe Ci::RetryBuildService do
current_accessors.uniq! current_accessors.uniq!
expect(known_accessors).to contain_exactly(*current_accessors) expect(current_accessors).to include(*processed_accessors)
expect(known_accessors).to include(*current_accessors)
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