Add latest changes from gitlab-org/gitlab@master

2 files changed, 30 insertions, 26 deletions

diff --git a/spec/lib/gitlab/graphql/connections/filterable_array_connection_spec.rb b/spec/lib/gitlab/graphql/connections/filterable_array_connection_spec.rb
new file mode 100644
index 00000000000..1fda84f777e
--- /dev/null
+++ b/spec/lib/gitlab/graphql/connections/filterable_array_connection_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Graphql::Connections::FilterableArrayConnection do
+  let(:callback) { proc { |nodes| nodes } }
+  let(:all_nodes) { Gitlab::Graphql::FilterableArray.new(callback, 1, 2, 3, 4, 5) }
+  let(:arguments) { {} }
+  subject(:connection) do
+    described_class.new(all_nodes, arguments, max_page_size: 3)
+  end
+
+  describe '#paged_nodes' do
+    let(:paged_nodes) { subject.paged_nodes }
+
+    it_behaves_like "connection with paged nodes"
+
+    context 'when callback filters some nodes' do
+      let(:callback) { proc { |nodes| nodes[1..-1] } }
+
+      it 'does not return filtered elements' do
+        expect(subject.paged_nodes).to contain_exactly(all_nodes[1], all_nodes[2])
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/graphql/connections/keyset/connection_spec.rb b/spec/lib/gitlab/graphql/connections/keyset/connection_spec.rb
index ba1addadb5a..9dda2a41ec6 100644
--- a/spec/lib/gitlab/graphql/connections/keyset/connection_spec.rb
+++ b/spec/lib/gitlab/graphql/connections/keyset/connection_spec.rb
@@ -240,38 +240,16 @@ describe Gitlab::Graphql::Connections::Keyset::Connection do
   end
 
   describe '#paged_nodes' do
-    let!(:projects) { create_list(:project, 5) }
+    let_it_be(:all_nodes) { create_list(:project, 5) }
+    let(:paged_nodes) { subject.paged_nodes }
 
-    it 'returns the collection limited to max page size' do
-      expect(subject.paged_nodes.size).to eq(3)
-    end
-
-    it 'is a loaded memoized array' do
-      expect(subject.paged_nodes).to be_an(Array)
-      expect(subject.paged_nodes.object_id).to eq(subject.paged_nodes.object_id)
-    end
-
-    context 'when `first` is passed' do
-      let(:arguments) { { first: 2 } }
-
-      it 'returns only the first elements' do
-        expect(subject.paged_nodes).to contain_exactly(projects.first, projects.second)
-      end
-    end
-
-    context 'when `last` is passed' do
-      let(:arguments) { { last: 2 } }
-
-      it 'returns only the last elements' do
-        expect(subject.paged_nodes).to contain_exactly(projects[3], projects[4])
-      end
-    end
+    it_behaves_like "connection with paged nodes"
 
     context 'when both are passed' do
       let(:arguments) { { first: 2, last: 2 } }
 
       it 'raises an error' do
-        expect { subject.paged_nodes }.to raise_error(Gitlab::Graphql::Errors::ArgumentError)
+        expect { paged_nodes }.to raise_error(Gitlab::Graphql::Errors::ArgumentError)
       end
     end