Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

5 files changed, 135 insertions, 2 deletions

diff --git a/spec/support/shared_examples/lib/cache_helpers_shared_examples.rb b/spec/support/shared_examples/lib/cache_helpers_shared_examples.rb
new file mode 100644
index 00000000000..845fa78a827
--- /dev/null
+++ b/spec/support/shared_examples/lib/cache_helpers_shared_examples.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for 'object cache helper' do
+  it { is_expected.to be_a(Gitlab::Json::PrecompiledJson) }
+
+  it "uses the presenter" do
+    expect(presenter).to receive(:represent).with(presentable, project: project)
+
+    subject
+  end
+
+  it "is valid JSON" do
+    parsed = Gitlab::Json.parse(subject.to_s)
+
+    expect(parsed).to be_a(Hash)
+    expect(parsed["id"]).to eq(presentable.id)
+  end
+
+  it "fetches from the cache" do
+    expect(instance.cache).to receive(:fetch).with("#{presenter.class.name}:#{presentable.cache_key}:#{user.cache_key}", expires_in: described_class::DEFAULT_EXPIRY).once
+
+    subject
+  end
+
+  context "when a cache context is supplied" do
+    before do
+      kwargs[:cache_context] = -> (item) { item.project.cache_key }
+    end
+
+    it "uses the context to augment the cache key" do
+      expect(instance.cache).to receive(:fetch).with("#{presenter.class.name}:#{presentable.cache_key}:#{project.cache_key}", expires_in: described_class::DEFAULT_EXPIRY).once
+
+      subject
+    end
+  end
+
+  context "when expires_in is supplied" do
+    it "sets the expiry when accessing the cache" do
+      kwargs[:expires_in] = 7.days
+
+      expect(instance.cache).to receive(:fetch).with("#{presenter.class.name}:#{presentable.cache_key}:#{user.cache_key}", expires_in: 7.days).once
+
+      subject
+    end
+  end
+end
+
+RSpec.shared_examples_for 'collection cache helper' do
+  it { is_expected.to be_an(Gitlab::Json::PrecompiledJson) }
+
+  it "uses the presenter" do
+    presentable.each do |item|
+      expect(presenter).to receive(:represent).with(item, project: project)
+    end
+
+    subject
+  end
+
+  it "is valid JSON" do
+    parsed = Gitlab::Json.parse(subject.to_s)
+
+    expect(parsed).to be_an(Array)
+
+    presentable.each_with_index do |item, i|
+      expect(parsed[i]["id"]).to eq(item.id)
+    end
+  end
+
+  it "fetches from the cache" do
+    keys = presentable.map { |item| "#{presenter.class.name}:#{item.cache_key}:#{user.cache_key}" }
+
+    expect(instance.cache).to receive(:fetch_multi).with(*keys, expires_in: described_class::DEFAULT_EXPIRY).once.and_call_original
+
+    subject
+  end
+
+  context "when a cache context is supplied" do
+    before do
+      kwargs[:cache_context] = -> (item) { item.project.cache_key }
+    end
+
+    it "uses the context to augment the cache key" do
+      keys = presentable.map { |item| "#{presenter.class.name}:#{item.cache_key}:#{project.cache_key}" }
+
+      expect(instance.cache).to receive(:fetch_multi).with(*keys, expires_in: described_class::DEFAULT_EXPIRY).once.and_call_original
+
+      subject
+    end
+  end
+
+  context "expires_in is supplied" do
+    it "sets the expiry when accessing the cache" do
+      keys = presentable.map { |item| "#{presenter.class.name}:#{item.cache_key}:#{user.cache_key}" }
+      kwargs[:expires_in] = 7.days
+
+      expect(instance.cache).to receive(:fetch_multi).with(*keys, expires_in: 7.days).once.and_call_original
+
+      subject
+    end
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/cycle_analytics/event_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/cycle_analytics/event_shared_examples.rb
index 7d341d79bae..6e12b5a0e85 100644
--- a/spec/support/shared_examples/lib/gitlab/cycle_analytics/event_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/cycle_analytics/event_shared_examples.rb
@@ -3,6 +3,7 @@
 RSpec.shared_examples_for 'value stream analytics event' do
   let(:params) { {} }
   let(:instance) { described_class.new(params) }
+  let(:expected_hash_code) { Digest::SHA256.hexdigest(instance.class.identifier.to_s) }
 
   it { expect(described_class.name).to be_a_kind_of(String) }
   it { expect(described_class.identifier).to be_a_kind_of(Symbol) }
@@ -19,4 +20,16 @@ RSpec.shared_examples_for 'value stream analytics event' do
       expect(output_query).to be_a_kind_of(ActiveRecord::Relation)
     end
   end
+
+  describe '#hash_code' do
+    it 'returns a hash that uniquely identifies an event' do
+      expect(instance.hash_code).to eq(expected_hash_code)
+    end
+
+    it 'does not differ when the same object is built with the same params' do
+      another_instance_with_same_params = described_class.new(params)
+
+      expect(another_instance_with_same_params.hash_code).to eq(instance.hash_code)
+    end
+  end
 end
diff --git a/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb
index 33061f17bde..3c5c65f0690 100644
--- a/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb
@@ -12,7 +12,7 @@ RSpec.shared_examples 'Notes user references' do
       'id' => 111,
       'access_level' => 30,
       'source_id' => 1,
-      'source_type' => importable.class.name == 'Project' ? 'Project' : 'Namespace',
+      'source_type' => importable.instance_of?(Project) ? 'Project' : 'Namespace',
       'user_id' => 3,
       'notification_level' => 3,
       'created_at' => '2016-11-18T09:29:42.634Z',
diff --git a/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb
index f018ece0d46..2633a89eeee 100644
--- a/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/kubernetes/network_policy_common_shared_examples.rb
@@ -19,7 +19,8 @@ RSpec.shared_examples 'network policy common specs' do
         creation_timestamp: nil,
         manifest: YAML.dump(policy.resource.deep_stringify_keys),
         is_autodevops: false,
-        is_enabled: true
+        is_enabled: true,
+        environment_ids: []
       }
     end
 
diff --git a/spec/support/shared_examples/lib/gitlab/search_results_sorted_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/search_results_sorted_shared_examples.rb
index eafb49cef71..e4f09dfa0b0 100644
--- a/spec/support/shared_examples/lib/gitlab/search_results_sorted_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/search_results_sorted_shared_examples.rb
@@ -33,3 +33,21 @@ RSpec.shared_examples 'search results sorted' do
     end
   end
 end
+
+RSpec.shared_examples 'search results sorted by popularity' do
+  context 'sort: popularity_desc' do
+    let(:sort) { 'popularity_desc' }
+
+    it 'sorts results by upvotes' do
+      expect(results_popular.objects(scope).map(&:id)).to eq([popular_result.id, less_popular_result.id, non_popular_result.id])
+    end
+  end
+
+  context 'sort: popularity_asc' do
+    let(:sort) { 'popularity_asc' }
+
+    it 'sorts results by created_at' do
+      expect(results_popular.objects(scope).map(&:id)).to eq([non_popular_result.id, less_popular_result.id, popular_result.id])
+    end
+  end
+end