diff options
author | Robert Speicher <rspeicher@gmail.com> | 2018-01-31 10:30:06 -0600 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-06 12:34:45 -0600 |
commit | bf0ec00996c37992e101fd4348f205a3ce851f6c (patch) | |
tree | 03398e37a67ae7ffa7107701744cd83952b46690 /qa/qa | |
parent | 7095c2bf4064911568ae1574752adbc066c5347d (diff) | |
download | gitlab-ce-bf0ec00996c37992e101fd4348f205a3ce851f6c.tar.gz |
Expand QA spec file paths to allow running bin/qa from anywhere
Diffstat (limited to 'qa/qa')
-rw-r--r-- | qa/qa/scenario/test/instance.rb | 7 | ||||
-rw-r--r-- | qa/qa/specs/runner.rb | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/qa/qa/scenario/test/instance.rb b/qa/qa/scenario/test/instance.rb index 993bbd723a3..0af9afd1ea4 100644 --- a/qa/qa/scenario/test/instance.rb +++ b/qa/qa/scenario/test/instance.rb @@ -22,7 +22,12 @@ module QA Specs::Runner.perform do |specs| specs.tty = true specs.tags = self.class.focus - specs.files = files.any? ? files : 'qa/specs/features' + specs.files = + if files.any? + files + else + File.expand_path('../../specs/features', __dir__) + end end end end diff --git a/qa/qa/specs/runner.rb b/qa/qa/specs/runner.rb index 3f7b75df986..752e3e60b8c 100644 --- a/qa/qa/specs/runner.rb +++ b/qa/qa/specs/runner.rb @@ -8,7 +8,7 @@ module QA def initialize @tty = false @tags = [] - @files = ['qa/specs/features'] + @files = [File.expand_path('./features', __dir__)] end def perform |