summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwinniehell <git@winniehell.de>2017-03-20 21:21:13 +0100
committerwinniehell <git@winniehell.de>2017-03-23 19:22:30 +0100
commit9d951e5fd5ac78d050f76ab4e4e0159646336b57 (patch)
tree83d168d31cd44d2fb95861c2d4c342ad56a2547e
parent9bfff603fe91f56b0355e102f5d62c8dccc1d9f8 (diff)
downloadgitlab-ce-9d951e5fd5ac78d050f76ab4e4e0159646336b57.tar.gz
Include JavaScript test coverage in coverage badge (!10097)
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--README.md7
2 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 080d8cd6c7f..61eea4061e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -279,6 +279,7 @@ rake karma:
<<: *dedicated-runner
script:
- bundle exec rake karma
+ coverage: '/^Statements *: (\d+\.\d+%)/'
artifacts:
name: coverage-javascript
expire_in: 31d
@@ -343,6 +344,7 @@ coverage:
USE_BUNDLE_INSTALL: "true"
script:
- bundle exec scripts/merge-simplecov
+ coverage: '/LOC \((\d+\.\d+%)\) covered.$/'
artifacts:
name: coverage
expire_in: 31d
diff --git a/README.md b/README.md
index 09e08adbb73..f0e3b52ef6f 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,15 @@
# GitLab
[![Build status](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-ce/commits/master)
-[![CE coverage report](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=coverage)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby)
+[![Overall test coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-ce/pipelines)
[![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
[![Core Infrastructure Initiative Best Practices](https://bestpractices.coreinfrastructure.org/projects/42/badge)](https://bestpractices.coreinfrastructure.org/projects/42)
+## Test coverage
+
+- [![Ruby coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=coverage)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-ruby) Ruby
+- [![JavaScript coverage](https://gitlab.com/gitlab-org/gitlab-ce/badges/master/coverage.svg?job=rake+karma)](https://gitlab-org.gitlab.io/gitlab-ce/coverage-javascript) JavaScript
+
## Canonical source
The canonical source of GitLab Community Edition is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab-ce/).