diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 21:07:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 21:07:31 +0300 |
commit | d91f5211693e913da5df110b8de841fad87e3653 (patch) | |
tree | d1483aeb8fe3d2b9579b0e44f2e74979c4b8d17a /qa | |
parent | c859c3bfd242288065fe5e2d887f7204f09e2335 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/project/settings/protected_branches.rb | 1 | ||||
-rw-r--r-- | qa/qa/scenario/template.rb | 2 | ||||
-rw-r--r-- | qa/qa/scenario/test/instance.rb | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/qa/qa/page/project/settings/protected_branches.rb b/qa/qa/page/project/settings/protected_branches.rb index f718311fbf2..9d302acb058 100644 --- a/qa/qa/page/project/settings/protected_branches.rb +++ b/qa/qa/page/project/settings/protected_branches.rb @@ -47,6 +47,7 @@ module QA def protect_branch click_element(:protect_button, wait: QA::Support::Repeater::DEFAULT_MAX_WAIT_TIME) + wait_for_requests end private 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? |