Add latest changes from gitlab-org/gitlab@master

spec/frontend/monitoring/embed/embed_spec.js

 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import Vuex from 'vuex';
 import Embed from '~/monitoring/components/embed.vue';
-import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue';
+import PanelType from 'ee_else_ce/monitoring/components/panel_type.vue';
 import { TEST_HOST } from 'helpers/test_constants';
 import { groups, initialState, metricsData, metricsWithData } from './mock_data';
@@ -55,7 +55,7 @@ describe('Embed', () => {
     it('shows an empty state when no metrics are present', () => {
       expect(wrapper.find('.metrics-embed').exists()).toBe(true);
-      expect(wrapper.find(MonitorTimeSeriesChart).exists()).toBe(false);
+      expect(wrapper.find(PanelType).exists()).toBe(false);
     });
   });
@@ -71,12 +71,12 @@ describe('Embed', () => {
     it('shows a chart when metrics are present', () => {
       wrapper.setProps({});
       expect(wrapper.find('.metrics-embed').exists()).toBe(true);
-      expect(wrapper.find(MonitorTimeSeriesChart).exists()).toBe(true);
-      expect(wrapper.findAll(MonitorTimeSeriesChart).length).toBe(2);
+      expect(wrapper.find(PanelType).exists()).toBe(true);
+      expect(wrapper.findAll(PanelType).length).toBe(2);
     });
     it('includes groupId with dashboardUrl', () => {
-      expect(wrapper.find(MonitorTimeSeriesChart).props('groupId')).toBe(TEST_HOST);
+      expect(wrapper.find(PanelType).props('groupId')).toBe(TEST_HOST);
     });
   });
 });

spec/frontend/monitoring/panel_type_spec.js

@@ -102,6 +102,10 @@ describe('Panel Type component', () => {
         expect(clipboardText()).toBe(exampleText);
       });
+
+      it('includes a default group id', () => {
+        expect(panelType.vm.groupId).toBe('panel-type-chart');
+      });
     });
     describe('Anomaly Chart panel type', () => {

spec/lib/gitlab/diff/file_collection/merge_request_diff_batch_spec.rb

@@ -123,4 +123,8 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiffBatch do
                           collection_default_args)
     end
   end
+
+  it_behaves_like 'cacheable diff collection' do
+    let(:cacheable_files_count) { batch_size }
+  end
 end

spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb

@@ -4,7 +4,8 @@ require 'spec_helper'
 describe Gitlab::Diff::FileCollection::MergeRequestDiff do
   let(:merge_request) { create(:merge_request) }
-  let(:subject) { described_class.new(merge_request.merge_request_diff, diff_options: nil) }
+  let(:diffable) { merge_request.merge_request_diff }
+  let(:subject) { described_class.new(diffable, diff_options: nil) }
   let(:diff_files) { subject.diff_files }
   describe '#diff_files' do
@@ -52,6 +53,10 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
     let(:stub_path) { '.gitignore' }
   end
+  it_behaves_like 'cacheable diff collection' do
+    let(:cacheable_files_count) { diffable.size.to_i }
+  end
+
   it 'returns a valid instance of a DiffCollection' do
     expect(diff_files).to be_a(Gitlab::Git::DiffCollection)
   end

spec/presenters/ci/legacy_stage_presenter_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::LegacyStagePresenter do
+  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) }
+
+  before do
+    create(:generic_commit_status, pipeline: legacy_stage.pipeline, stage: legacy_stage.name)
+  end
+
+  describe '#latest_ordered_statuses' do
+    subject(:latest_ordered_statuses) { presenter.latest_ordered_statuses }
+
+    it 'preloads build tags' do
+      expect(latest_ordered_statuses.second.association(:tags)).to be_loaded
+    end
+  end
+
+  describe '#retried_ordered_statuses' do
+    subject(:retried_ordered_statuses) { presenter.retried_ordered_statuses }
+
+    it 'preloads build tags' do
+      expect(retried_ordered_statuses.first.association(:tags)).to be_loaded
+    end
+  end
+end

spec/support/shared_examples/diff_file_collections.rb

@@ -57,3 +57,45 @@ shared_examples 'unfoldable diff' do
     subject.unfold_diff_files([position])
   end
 end
+
+shared_examples 'cacheable diff collection' do
+  let(:cache) { instance_double(Gitlab::Diff::HighlightCache) }
+
+  before do
+    expect(Gitlab::Diff::HighlightCache).to receive(:new).with(subject) { cache }
+  end
+
+  describe '#write_cache' do
+    it 'calls Gitlab::Diff::HighlightCache#write_if_empty' do
+      expect(cache).to receive(:write_if_empty).once
+
+      subject.write_cache
+    end
+  end
+
+  describe '#clear_cache' do
+    it 'calls Gitlab::Diff::HighlightCache#clear' do
+      expect(cache).to receive(:clear).once
+
+      subject.clear_cache
+    end
+  end
+
+  describe '#cache_key' do
+    it 'calls Gitlab::Diff::HighlightCache#key' do
+      expect(cache).to receive(:key).once
+
+      subject.cache_key
+    end
+  end
+
+  describe '#diff_files' do
+    it 'calls Gitlab::Diff::HighlightCache#decorate' do
+      expect(cache).to receive(:decorate)
+        .with(instance_of(Gitlab::Diff::File))
+        .exactly(cacheable_files_count).times
+
+      subject.diff_files
+    end
+  end
+end