summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2019-06-03 09:27:16 +0200
committerAlessio Caiazza <acaiazza@gitlab.com>2019-06-03 09:27:16 +0200
commit44517d428bdd9fdaaccfafa486539a2f38b672c4 (patch)
tree6950e3fd128f950a45ccb35e63d1a4b9e446c79d
parent75fce3e8f4acfa2da1a88b56ccaad90a0ca780ef (diff)
downloadgitlab-ce-ac-graphql-stats.tar.gz
Always increase complexity by 10ac-graphql-stats
-rw-r--r--app/graphql/resolvers/namespace_projects_resolver.rb4
-rw-r--r--spec/graphql/resolvers/namespace_projects_resolver_spec.rb4
-rw-r--r--spec/requests/api/graphql/namespace/projects_spec.rb14
3 files changed, 10 insertions, 12 deletions
diff --git a/app/graphql/resolvers/namespace_projects_resolver.rb b/app/graphql/resolvers/namespace_projects_resolver.rb
index 97b7f993900..3a1a211a535 100644
--- a/app/graphql/resolvers/namespace_projects_resolver.rb
+++ b/app/graphql/resolvers/namespace_projects_resolver.rb
@@ -27,9 +27,7 @@ module Resolvers
def self.resolver_complexity(args)
complexity = super
- complexity += 10 if args[:include_subgroups]
-
- complexity
+ complexity + 10
end
end
end
diff --git a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb
index e6fa33c5073..395e08081d3 100644
--- a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb
+++ b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb
@@ -56,10 +56,10 @@ describe Resolvers::NamespaceProjectsResolver, :nested_groups do
end
end
- it 'increases field complexity based on arguments' do
+ it 'has an high complexity regardless of arguments' do
field = Types::BaseField.new(name: 'test', type: GraphQL::STRING_TYPE, resolver_class: described_class, null: false, max_page_size: 100)
- expect(field.to_graphql.complexity.call({}, {}, 1)).to eq 4
+ expect(field.to_graphql.complexity.call({}, {}, 1)).to eq 24
expect(field.to_graphql.complexity.call({}, { include_subgroups: true }, 1)).to eq 24
end
diff --git a/spec/requests/api/graphql/namespace/projects_spec.rb b/spec/requests/api/graphql/namespace/projects_spec.rb
index 4c65b243daf..e05273da4bd 100644
--- a/spec/requests/api/graphql/namespace/projects_spec.rb
+++ b/spec/requests/api/graphql/namespace/projects_spec.rb
@@ -5,16 +5,16 @@ require 'spec_helper'
describe 'getting projects', :nested_groups do
include GraphqlHelpers
- let(:group) { create(:group) }
- let!(:project) { create(:project, namespace: subject) }
- let(:nested_group) { create(:group, parent: group) }
- let!(:nested_project) { create(:project, group: nested_group) }
- let!(:public_project) { create(:project, :public, namespace: subject) }
- let(:user) { create(:user) }
+ let(:group) { create(:group) }
+ let!(:project) { create(:project, namespace: subject) }
+ let(:nested_group) { create(:group, parent: group) }
+ let!(:nested_project) { create(:project, group: nested_group) }
+ let!(:public_project) { create(:project, :public, namespace: subject) }
+ let(:user) { create(:user) }
+ let(:include_subgroups) { true }
subject { group }
- let(:include_subgroups) { true }
let(:query) do
graphql_query_for(
'namespace',