move requires for matchers and gems into qa.rb since it's the first file loaded

2 files changed, 4 insertions, 7 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index 48f0fa099ad..b3ff9d123f5 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -1,5 +1,9 @@
 $: << File.expand_path(File.dirname(__FILE__))
 
+require 'rspec/core'
+require 'faraday'
+require_relative 'qa/support/matchers/have_gitlab_api_status'
+
 module QA
   ##
   # GitLab QA runtime classes, mostly singletons.
@@ -152,10 +156,6 @@ module QA
   #
   module Support
     autoload :ApiHelpers, 'qa/support/api_helpers'
-
-    # module Matchers
-    #   autoload :ApiHelpers, 'qa/support/matchers/have_gitlab_http_status'
-    # end
   end
 end
 
diff --git a/qa/qa/specs/runner.rb b/qa/qa/specs/runner.rb
index b61ae43f980..9ede404c90e 100644
--- a/qa/qa/specs/runner.rb
+++ b/qa/qa/specs/runner.rb
@@ -1,6 +1,3 @@
-require 'rspec/core'
-require_relative '../support/matchers/have_gitlab_api_status'
-
 module QA
   module Specs
     class Runner < Scenario::Template