summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-08-31 12:22:33 +0200
committerKamil Trzciński <ayufan@ayufan.eu>2018-09-03 14:59:55 +0200
commit789fae50fb643201aee178c3748df5b7bce588c6 (patch)
tree517aef61b904fe697666dacf8d25f3d67f732469
parent0e9dc23d4622332c3f8874ba024cac9aa28277a3 (diff)
downloadgitlab-ce-789fae50fb643201aee178c3748df5b7bce588c6.tar.gz
Enable JUnit results for rspec
-rw-r--r--.gitignore1
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock4
-rw-r--r--Gemfile.rails5.lock5
5 files changed, 13 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 9a42a663fb4..eb0875a977f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,4 @@ eslint-report.html
/plugins/*
/.gitlab_pages_secret
package-lock.json
+/junit_rspec.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 797a20ef16e..a3d630e076c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,7 +171,7 @@ stages:
- '[[ -f $FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_REPORT_PATH}'
- '[[ -f $NEW_FLAKY_RSPEC_REPORT_PATH ]] || echo "{}" > ${NEW_FLAKY_RSPEC_REPORT_PATH}'
- scripts/gitaly-test-spawn
- - knapsack rspec "--color --format documentation"
+ - knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml"
artifacts:
expire_in: 31d
when: always
@@ -180,6 +180,8 @@ stages:
- knapsack/
- rspec_flaky/
- tmp/capybara/
+ reports:
+ junit: junit_rspec.xml
.rspec-metadata-pg: &rspec-metadata-pg
<<: *rspec-metadata
diff --git a/Gemfile b/Gemfile
index 208289cb7fb..3837fd2ac7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -387,6 +387,7 @@ group :test do
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.0.5'
gem 'test-prof', '~> 0.2.5'
+ gem 'rspec_junit_formatter'
end
gem 'octokit', '~> 4.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index 77effb63d2e..c9fe3a5a355 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -776,6 +776,9 @@ GEM
rspec-core
rspec-set (0.1.3)
rspec-support (3.7.1)
+ rspec_junit_formatter (0.2.3)
+ builder (< 4)
+ rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.5)
activerecord
pg
@@ -1149,6 +1152,7 @@ DEPENDENCIES
rspec-rails (~> 3.7.0)
rspec-retry (~> 0.4.5)
rspec-set (~> 0.1.3)
+ rspec_junit_formatter
rspec_profiling (~> 0.0.5)
rubocop (~> 0.54.0)
rubocop-rspec (~> 1.22.1)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index f9ec29cde90..9f0c8497e1f 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -786,6 +786,8 @@ GEM
rspec-core
rspec-set (0.1.3)
rspec-support (3.7.1)
+ rspec_junit_formatter (0.4.1)
+ rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.5)
activerecord
pg
@@ -1162,6 +1164,7 @@ DEPENDENCIES
rspec-rails (~> 3.7.0)
rspec-retry (~> 0.4.5)
rspec-set (~> 0.1.3)
+ rspec_junit_formatter
rspec_profiling (~> 0.0.5)
rubocop (~> 0.54.0)
rubocop-rspec (~> 1.22.1)
@@ -1213,4 +1216,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.16.3
+ 1.16.4