Commit ba79e428 authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent 6f4af17461e2
......@@ -15,9 +15,10 @@ def retried_ordered_statuses
private
def preload_statuses(statuses)
loaded_statuses = statuses.load
statuses.tap do |statuses|
# rubocop: disable CodeReuse/ActiveRecord
ActiveRecord::Associations::Preloader.new.preload(preloadable_statuses(statuses), :tags)
ActiveRecord::Associations::Preloader.new.preload(preloadable_statuses(loaded_statuses), %w[tags job_artifacts_archive metadata])
# rubocop: enable CodeReuse/ActiveRecord
end
end
......
......@@ -6,8 +6,8 @@
let(:legacy_stage) { create(:ci_stage) }
let(:presenter) { described_class.new(legacy_stage) }
let!(:build) { create(:ci_build, :tags, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
let!(:retried_build) { create(:ci_build, :tags, :retried, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
let!(:build) { create(:ci_build, :tags, :artifacts, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
let!(:retried_build) { create(:ci_build, :tags, :artifacts, :retried, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
before do
create(:generic_commit_status, pipeline: legacy_stage.pipeline, stage: legacy_stage.name)
......@@ -19,6 +19,14 @@
it 'preloads build tags' do
expect(latest_ordered_statuses.second.association(:tags)).to be_loaded
end
it 'preloads build artifacts archive' do
expect(latest_ordered_statuses.second.association(:job_artifacts_archive)).to be_loaded
end
it 'preloads build artifacts metadata' do
expect(latest_ordered_statuses.second.association(:metadata)).to be_loaded
end
end
describe '#retried_ordered_statuses' do
......@@ -27,5 +35,13 @@
it 'preloads build tags' do
expect(retried_ordered_statuses.first.association(:tags)).to be_loaded
end
it 'preloads build artifacts archive' do
expect(retried_ordered_statuses.first.association(:job_artifacts_archive)).to be_loaded
end
it 'preloads build artifacts metadata' do
expect(retried_ordered_statuses.first.association(:metadata)).to be_loaded
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