diff options
| author | Dan Davison <ddavison@gitlab.com> | 2018-08-21 07:10:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-21 07:10:27 +0000 |
| commit | c147c3eff2cdf4d02932c1020228aca5ba4ff569 (patch) | |
| tree | f6959721cdc0252acde933ec5166f71418d4f0fc | |
| parent | cbdd306ca32762c5268a69f7150eb49fd0c17696 (diff) | |
| download | gitlab-ce-c147c3eff2cdf4d02932c1020228aca5ba4ff569.tar.gz | |
fix broken pathing (remove extraneous ../)
| -rw-r--r-- | qa/qa/scenario/template.rb | 2 | ||||
| -rw-r--r-- | qa/spec/scenario/test/instance/all_spec.rb | 2 | ||||
| -rw-r--r-- | qa/spec/scenario/test/instance/smoke_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qa/qa/scenario/template.rb b/qa/qa/scenario/template.rb index 765b7d317e0..66eb86f25c8 100644 --- a/qa/qa/scenario/template.rb +++ b/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 diff --git a/qa/spec/scenario/test/instance/all_spec.rb b/qa/spec/scenario/test/instance/all_spec.rb index bc0b21c6494..423527e938e 100644 --- a/qa/spec/scenario/test/instance/all_spec.rb +++ b/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 diff --git a/qa/spec/scenario/test/instance/smoke_spec.rb b/qa/spec/scenario/test/instance/smoke_spec.rb index 66d71610341..e79d19e8212 100644 --- a/qa/spec/scenario/test/instance/smoke_spec.rb +++ b/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 |