diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-04-10 14:41:11 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-04-10 14:41:11 +0300 |
commit | 0de88f57997ef1d60467464f15411dae0c7ee870 (patch) | |
tree | e0479d56b16bb9bb343b00cde2380bf8aba1d0df | |
parent | 2238b12df9f416dbe752512a2cc256905648e6ed (diff) | |
parent | e116c45619899d668fd3bae65007cb5398c5bc80 (diff) |
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
-rw-r--r-- | spec/services/ci/retry_build_service_spec.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb index 87185891470..17e2b17a499 100644 --- a/spec/services/ci/retry_build_service_spec.rb +++ b/spec/services/ci/retry_build_service_spec.rb @@ -35,7 +35,7 @@ describe Ci::RetryBuildService do commit_id deployment erased_by_id project_id runner_id tag_taggings taggings tags trigger_request_id 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 shared_examples 'build duplication' do @@ -95,7 +95,8 @@ describe Ci::RetryBuildService do end 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 # in reflected associations, comes from `act_as_taggable` and @@ -108,7 +109,8 @@ describe Ci::RetryBuildService do 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 |