Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/support/matchers')
-rw-r--r--spec/support/matchers/exceed_query_limit.rb2
-rw-r--r--spec/support/matchers/graphql_matchers.rb6
2 files changed, 6 insertions, 2 deletions
diff --git a/spec/support/matchers/exceed_query_limit.rb b/spec/support/matchers/exceed_query_limit.rb
index bfcaf9552b3..6d7658b7c33 100644
--- a/spec/support/matchers/exceed_query_limit.rb
+++ b/spec/support/matchers/exceed_query_limit.rb
@@ -333,7 +333,7 @@ RSpec::Matchers.define :issue_same_number_of_queries_as do
or_fewer_msg = "or fewer" if @or_fewer
threshold_msg = "(+/- #{threshold})" unless threshold == 0
- ["#{expected_count}", or_fewer_msg, threshold_msg].compact.join(' ')
+ [expected_count.to_s, or_fewer_msg, threshold_msg].compact.join(' ')
end
def skip_cached
diff --git a/spec/support/matchers/graphql_matchers.rb b/spec/support/matchers/graphql_matchers.rb
index db7d4269945..155a6dba52c 100644
--- a/spec/support/matchers/graphql_matchers.rb
+++ b/spec/support/matchers/graphql_matchers.rb
@@ -169,7 +169,11 @@ RSpec::Matchers.define :have_graphql_type do |expected, opts = {}|
include GraphQLTypeHelpers
match do |object|
- expect(object.type).to eq(nullified(expected, opts[:null]))
+ if object.type.list?
+ expect(object.type.unwrap).to eq(nullified(expected, opts[:null]))
+ else
+ expect(object.type).to eq(nullified(expected, opts[:null]))
+ end
end
failure_message do |object|