Commit 477021bf authored by Brett Walker's avatar Brett Walker

Now use ActiveRecordRelationConnection

for OffsetActiveRecordRelationConnection.
Requires graphql-ruby 1.10.x
parent 5d17a264
...@@ -16,10 +16,6 @@ module Gitlab ...@@ -16,10 +16,6 @@ module Gitlab
Gitlab::Graphql::ExternallyPaginatedArray, Gitlab::Graphql::ExternallyPaginatedArray,
Gitlab::Graphql::Connections::ExternallyPaginatedArrayConnection Gitlab::Graphql::Connections::ExternallyPaginatedArrayConnection
) )
GraphQL::Relay::BaseConnection.register_connection_implementation(
Gitlab::Graphql::Pagination::Relations::OffsetActiveRecordRelation,
Gitlab::Graphql::Pagination::OffsetActiveRecordRelationConnection
)
end end
end end
end end
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
module Gitlab module Gitlab
module Graphql module Graphql
module Pagination module Pagination
class OffsetActiveRecordRelationConnection < GraphQL::Relay::RelationConnection class OffsetActiveRecordRelationConnection < GraphQL::Pagination::ActiveRecordRelationConnection
end end
end end
end end
......
# frozen_string_literal: true
module Gitlab
module Graphql
module Pagination
module Relations
class OffsetActiveRecordRelation < ::ActiveRecord::Relation
end
end
end
end
end
...@@ -52,12 +52,6 @@ describe GitlabSchema do ...@@ -52,12 +52,6 @@ describe GitlabSchema do
expect(connection).to eq(Gitlab::Graphql::Connections::FilterableArrayConnection) expect(connection).to eq(Gitlab::Graphql::Connections::FilterableArrayConnection)
end end
it 'paginates OffsetActiveRecordRelation using `Pagination::OffsetActiveRecordRelationConnection`' do
connection = implementations[Gitlab::Graphql::Pagination::Relations::OffsetActiveRecordRelation.name]
expect(connection).to eq(Gitlab::Graphql::Pagination::OffsetActiveRecordRelationConnection)
end
describe '.execute' do describe '.execute' do
context 'for different types of users' do context 'for different types of users' do
context 'when no context' do context 'when no context' do
......
...@@ -4,6 +4,6 @@ require 'spec_helper' ...@@ -4,6 +4,6 @@ require 'spec_helper'
describe Gitlab::Graphql::Pagination::OffsetActiveRecordRelationConnection do describe Gitlab::Graphql::Pagination::OffsetActiveRecordRelationConnection do
it 'subclasses from GraphQL::Relay::RelationConnection' do it 'subclasses from GraphQL::Relay::RelationConnection' do
expect(described_class.superclass).to eq GraphQL::Relay::RelationConnection expect(described_class.superclass).to eq GraphQL::Pagination::ActiveRecordRelationConnection
end 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