summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-08-29 06:43:26 +0000
committerKushal Pandya <kushalspandya@gmail.com>2019-08-29 06:43:26 +0000
commit3ec8079f84857f8301ef56716753951289e05fb0 (patch)
tree9beef350e453e7a6c392c00d35fb24d21817403c
parent9174d9a23f7f6fddec94b5ce22f99a2ce6bb491e (diff)
parent05ec97d40379b7ff9767dcc1a7fd8216cf79ec60 (diff)
downloadgitlab-ce-3ec8079f84857f8301ef56716753951289e05fb0.tar.gz
Merge branch 'docs/mention-jest-in-testing-guide' into 'master'
Mention Jest in testing guide docs See merge request gitlab-org/gitlab-ce!32324
-rw-r--r--doc/development/testing_guide/index.md4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/development/testing_guide/index.md b/doc/development/testing_guide/index.md
index 96e8c30a679..173471e3af8 100644
--- a/doc/development/testing_guide/index.md
+++ b/doc/development/testing_guide/index.md
@@ -13,7 +13,7 @@ importance.
GitLab is built on top of [Ruby on Rails](https://rubyonrails.org/), and we're using [RSpec] for all
the backend tests, with [Capybara] for end-to-end integration testing.
-On the frontend side, we're using [Karma] and [Jasmine] for JavaScript unit and
+On the frontend side, we're using [Jest](https://jestjs.io/) and [Karma](http://karma-runner.github.io/)/[Jasmine](https://jasmine.github.io/) for JavaScript unit and
integration testing.
Following are two great articles that everyone should read to understand what
@@ -64,6 +64,4 @@ Everything you should know about how to run end-to-end tests using
[RSpec]: https://github.com/rspec/rspec-rails#feature-specs
[Capybara]: https://github.com/teamcapybara/capybara
-[Karma]: http://karma-runner.github.io/
-[Jasmine]: https://jasmine.github.io/
[gitlab-qa]: https://gitlab.com/gitlab-org/gitlab-qa