From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jul 2020 12:26:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee --- spec/support_specs/helpers/active_record/query_recorder_spec.rb | 2 +- spec/support_specs/helpers/graphql_helpers_spec.rb | 2 +- spec/support_specs/helpers/stub_feature_flags_spec.rb | 2 +- spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/support_specs') diff --git a/spec/support_specs/helpers/active_record/query_recorder_spec.rb b/spec/support_specs/helpers/active_record/query_recorder_spec.rb index d15fbb5d4c3..f968f511a2a 100644 --- a/spec/support_specs/helpers/active_record/query_recorder_spec.rb +++ b/spec/support_specs/helpers/active_record/query_recorder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ActiveRecord::QueryRecorder do +RSpec.describe ActiveRecord::QueryRecorder do before do stub_const('TestQueries', Class.new(ActiveRecord::Base)) diff --git a/spec/support_specs/helpers/graphql_helpers_spec.rb b/spec/support_specs/helpers/graphql_helpers_spec.rb index bfc71f519cf..bc777621674 100644 --- a/spec/support_specs/helpers/graphql_helpers_spec.rb +++ b/spec/support_specs/helpers/graphql_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe GraphqlHelpers do +RSpec.describe GraphqlHelpers do include GraphqlHelpers describe '.graphql_mutation' do diff --git a/spec/support_specs/helpers/stub_feature_flags_spec.rb b/spec/support_specs/helpers/stub_feature_flags_spec.rb index e90a7f68a90..8d5f16751ae 100644 --- a/spec/support_specs/helpers/stub_feature_flags_spec.rb +++ b/spec/support_specs/helpers/stub_feature_flags_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe StubFeatureFlags do +RSpec.describe StubFeatureFlags do let(:feature_name) { :test_feature } describe '#stub_feature_flags' do diff --git a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb index 4a711b43d9a..15b846f28cb 100644 --- a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb +++ b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe ExceedQueryLimitHelpers do +RSpec.describe ExceedQueryLimitHelpers do before do stub_const('TestQueries', Class.new(ActiveRecord::Base)) stub_const('TestMatcher', Class.new) -- cgit v1.2.3