diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:07:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:07:31 +0000 |
| commit | d91f5211693e913da5df110b8de841fad87e3653 (patch) | |
| tree | d1483aeb8fe3d2b9579b0e44f2e74979c4b8d17a /qa/qa/scenario | |
| parent | c859c3bfd242288065fe5e2d887f7204f09e2335 (diff) | |
| download | gitlab-ce-d91f5211693e913da5df110b8de841fad87e3653.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/qa/scenario')
| -rw-r--r-- | qa/qa/scenario/template.rb | 2 | ||||
| -rw-r--r-- | qa/qa/scenario/test/instance.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/qa/qa/scenario/template.rb b/qa/qa/scenario/template.rb index 97373f7a059..9c599ec2d4d 100644 --- a/qa/qa/scenario/template.rb +++ b/qa/qa/scenario/template.rb @@ -23,6 +23,8 @@ module QA def perform(options, *args) extract_address(:gitlab_address, options, args) + QA::Runtime::Browser.configure! + Runtime::Feature.enable(options[:enable_feature]) if options.key?(:enable_feature) Specs::Runner.perform do |specs| diff --git a/qa/qa/scenario/test/instance.rb b/qa/qa/scenario/test/instance.rb index 79dad7f4619..11b6a7f7dfa 100644 --- a/qa/qa/scenario/test/instance.rb +++ b/qa/qa/scenario/test/instance.rb @@ -20,6 +20,8 @@ module QA def self.do_perform(address, *rspec_options) Runtime::Scenario.define(:gitlab_address, address) + QA::Runtime::Browser.configure! + Specs::Runner.perform do |specs| specs.tty = true specs.options = rspec_options if rspec_options.any? |