Merge branch 'qa-fix-broken-pathing' into 'master'

fix broken pathing (remove extraneous ../)

See merge request gitlab-org/gitlab-ce!21318

qa/qa/scenario/template.rb

@@ -28,7 +28,7 @@ module QA
             if rspec_options.any?
               rspec_options
             else
-              File.expand_path('../../specs/features', __dir__)
+              ::File.expand_path('../specs/features', __dir__)
             end
         end
       end

qa/spec/scenario/test/instance/all_spec.rb

@@ -24,7 +24,7 @@ describe QA::Scenario::Test::Instance::All do
         subject.perform("test")
 
         expect(runner).to have_received(:options=)
-          .with(::File.expand_path('../../../../../qa/specs/features', __dir__))
+          .with(::File.expand_path('../../../../qa/specs/features', __dir__))
       end
     end
 

qa/spec/scenario/test/instance/smoke_spec.rb

@@ -30,7 +30,7 @@ describe QA::Scenario::Test::Instance::Smoke do
         subject.perform("test")
 
         expect(runner).to have_received(:options=)
-          .with(File.expand_path('../../../../../qa/specs/features', __dir__))
+          .with(::File.expand_path('../../../../qa/specs/features', __dir__))
       end
     end