diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 12:08:38 +0000 |
commit | 5ad0cf26551baff8f08af8562a8d45e6ec14d71a (patch) | |
tree | 57f1a6bad31bcd11efacd3fdfb9cc92f88fb6a86 /qa/qa/scenario | |
parent | f47c768fad17d4c876e96524f83f8306f071db66 (diff) | |
download | gitlab-ce-5ad0cf26551baff8f08af8562a8d45e6ec14d71a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/scenario')
-rw-r--r-- | qa/qa/scenario/template.rb | 5 | ||||
-rw-r--r-- | qa/qa/scenario/test/instance.rb | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/qa/qa/scenario/template.rb b/qa/qa/scenario/template.rb index 9c599ec2d4d..74d4c8f8757 100644 --- a/qa/qa/scenario/template.rb +++ b/qa/qa/scenario/template.rb @@ -23,7 +23,10 @@ module QA def perform(options, *args) extract_address(:gitlab_address, options, args) - QA::Runtime::Browser.configure! + ## + # Perform before hooks, which are different for CE and EE + # + Runtime::Release.perform_before_hooks Runtime::Feature.enable(options[:enable_feature]) if options.key?(:enable_feature) diff --git a/qa/qa/scenario/test/instance.rb b/qa/qa/scenario/test/instance.rb index 11b6a7f7dfa..b4098619e4e 100644 --- a/qa/qa/scenario/test/instance.rb +++ b/qa/qa/scenario/test/instance.rb @@ -20,7 +20,10 @@ module QA def self.do_perform(address, *rspec_options) Runtime::Scenario.define(:gitlab_address, address) - QA::Runtime::Browser.configure! + ## + # Perform before hooks, which are different for CE and EE + # + Runtime::Release.perform_before_hooks Specs::Runner.perform do |specs| specs.tty = true |