Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/requests/api/graphql/gitlab_schema_spec.rb b/spec/requests/api/graphql/gitlab_schema_spec.rb
index 8d020cd3a4e..cf409ea6c2d 100644
--- a/spec/requests/api/graphql/gitlab_schema_spec.rb
+++ b/spec/requests/api/graphql/gitlab_schema_spec.rb
@@ -11,11 +11,11 @@ describe 'GitlabSchema configurations' do
     describe 'timeouts' do
       context 'when timeout is reached' do
         it 'shows an error' do
-          Timecop.scale(50000000) do # ludicrously large number because the timeout has to happen before the query even begins
-            subject
+          allow_any_instance_of(Gitlab::Graphql::Timeout).to receive(:max_seconds).and_return(0)
 
-            expect_graphql_errors_to_include /Timeout/
-          end
+          subject
+
+          expect_graphql_errors_to_include /Timeout/
         end
       end
     end
@@ -140,7 +140,7 @@ describe 'GitlabSchema configurations' do
     end
 
     it_behaves_like 'imposing query limits' do
-      it "fails all queries when only one of the queries is too complex" do
+      it 'fails all queries when only one of the queries is too complex' do
         # The `project` query above has a complexity of 5
         allow(GitlabSchema).to receive(:max_query_complexity).and_return 4