Commit 1c0f47ae authored by Walmyr Lima e Silva Filho's avatar Walmyr Lima e Silva Filho

Merge branch 'fix-qa-template' into 'master'

Configure the browser before running any QA scenario

See merge request gitlab-org/gitlab!23411
parents 1ef9c067 89a03cc1
...@@ -23,6 +23,8 @@ module QA ...@@ -23,6 +23,8 @@ module QA
def perform(options, *args) def perform(options, *args)
extract_address(:gitlab_address, options, args) extract_address(:gitlab_address, options, args)
QA::Runtime::Browser.configure!
Runtime::Feature.enable(options[:enable_feature]) if options.key?(:enable_feature) Runtime::Feature.enable(options[:enable_feature]) if options.key?(:enable_feature)
Specs::Runner.perform do |specs| Specs::Runner.perform do |specs|
......
...@@ -20,6 +20,8 @@ module QA ...@@ -20,6 +20,8 @@ module QA
def self.do_perform(address, *rspec_options) def self.do_perform(address, *rspec_options)
Runtime::Scenario.define(:gitlab_address, address) Runtime::Scenario.define(:gitlab_address, address)
QA::Runtime::Browser.configure!
Specs::Runner.perform do |specs| Specs::Runner.perform do |specs|
specs.tty = true specs.tty = true
specs.options = rspec_options if rspec_options.any? specs.options = rspec_options if rspec_options.any?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment