diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-09-04 13:33:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-04 13:33:50 +0000 |
| commit | 3a4d3dff516a187923fa2442da88b44915a9c97c (patch) | |
| tree | d6b0f7b17868dbc30b37cfebcd256e06fe641a30 | |
| parent | afb49b044bcb71702edd3f5ef0139599ddc54ef5 (diff) | |
| parent | 789fae50fb643201aee178c3748df5b7bce588c6 (diff) | |
| download | gitlab-ce-3a4d3dff516a187923fa2442da88b44915a9c97c.tar.gz | |
Merge branch 'junit-results' into 'master'
Enable JUnit results for rspec
See merge request gitlab-org/gitlab-ce!21449
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails5.lock | 3 |
5 files changed, 12 insertions, 1 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 db1ce3e9054..1b4134282c9 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 @@ -389,6 +389,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 43998d6003d..b9fa9c74919 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -770,6 +770,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 @@ -1143,6 +1146,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 7344ea5b4d6..0171c3564e3 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -779,6 +779,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 @@ -1154,6 +1156,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) |