diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-03 13:25:14 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-28 16:32:59 +0200 |
| commit | 520fcaab1c202d4cfe0703c324f46e821d93e1ef (patch) | |
| tree | eaec36b10df424a2983057b9b8de0f12dded0219 /qa/qa | |
| parent | 02e9a8f947fafe246f91e6da3b056fee11aaab7b (diff) | |
| download | gitlab-ce-520fcaab1c202d4cfe0703c324f46e821d93e1ef.tar.gz | |
Allow to pass --tag to bin/qa run
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'qa/qa')
| -rw-r--r-- | qa/qa/scenario/template.rb | 8 | ||||
| -rw-r--r-- | qa/qa/scenario/test/instance.rb | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/qa/qa/scenario/template.rb b/qa/qa/scenario/template.rb index 66eb86f25c8..a87d925ce32 100644 --- a/qa/qa/scenario/template.rb +++ b/qa/qa/scenario/template.rb @@ -21,14 +21,18 @@ module QA def perform(address, *rspec_options) Runtime::Scenario.define(:gitlab_address, address) + ## + # Perform before hooks, which are different for CE and EE + # + Runtime::Release.perform_before_hooks + Specs::Runner.perform do |specs| specs.tty = true - specs.tags = self.class.focus specs.options = if rspec_options.any? rspec_options else - ::File.expand_path('../specs/features', __dir__) + ['--tag', self.class.focus.join(','), '--', ::File.expand_path('../specs/features', __dir__)] end end end diff --git a/qa/qa/scenario/test/instance.rb b/qa/qa/scenario/test/instance.rb index 2117a610efb..e41c742376a 100644 --- a/qa/qa/scenario/test/instance.rb +++ b/qa/qa/scenario/test/instance.rb @@ -20,13 +20,18 @@ module QA def self.do_perform(address, *rspec_options) Runtime::Scenario.define(:gitlab_address, address) + ## + # Perform before hooks, which are different for CE and EE + # + Runtime::Release.perform_before_hooks + Specs::Runner.perform do |specs| specs.tty = true specs.options = if rspec_options.any? rspec_options else - ::File.expand_path('../../specs/features', __dir__) + ['--tag', self.class.focus.join(','), '--', ::File.expand_path('../../specs/features', __dir__)] end end end |