diff options
author | Mark Lapierre <mlapierre@gitlab.com> | 2019-07-18 02:44:53 +0300 |
---|---|---|
committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-07-18 02:44:53 +0300 |
commit | f74bd44d2a9171c51ec7c9a622d7628044791d9e (patch) | |
tree | c945826c01da7cf54443102368a9108887c97dae /qa | |
parent | ddf2dcf7fdad69135cee590307773b255d2fe0b5 (diff) | |
parent | a1bee1a09d529007c4ff11ab55d355b51f352ed8 (diff) |
Merge branch 'qa-review-knapsack-reports' into 'master'
Generate single report file for review-qa-all parallel tests
See merge request gitlab-org/gitlab-ce!28834
Diffstat (limited to 'qa')
-rw-r--r-- | qa/Gemfile | 1 | ||||
-rw-r--r-- | qa/Gemfile.lock | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index c46be8a0362..53e7cc497e2 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -10,6 +10,7 @@ gem 'selenium-webdriver', '~> 3.12' gem 'airborne', '~> 0.2.13' gem 'nokogiri', '~> 1.10.3' gem 'rspec-retry', '~> 0.6.1' +gem 'rspec_junit_formatter', '~> 0.4.1' gem 'faker', '~> 1.6', '>= 1.6.6' gem 'knapsack', '~> 1.17' gem 'parallel_tests', '~> 2.29' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 73aabf2c6ad..7d19366f83b 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -87,6 +87,8 @@ GEM rspec-retry (0.6.1) rspec-core (> 3.3) rspec-support (3.7.0) + rspec_junit_formatter (0.4.1) + rspec-core (>= 2, < 4, != 2.12.0) rubyzip (1.2.2) selenium-webdriver (3.141.0) childprocess (~> 0.5) @@ -116,6 +118,7 @@ DEPENDENCIES rake (~> 12.3.0) rspec (~> 3.7) rspec-retry (~> 0.6.1) + rspec_junit_formatter (~> 0.4.1) selenium-webdriver (~> 3.12) BUNDLED WITH |