diff options
| author | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
|---|---|---|
| committer | Joshua Lambert <joshua@gitlab.com> | 2017-03-16 18:45:46 +0000 |
| commit | d2f209a60b2ea2d889eaf5142c8d09ba0848a4c3 (patch) | |
| tree | 62810ea2d1f8aa1d131e31ad667c39ea0a6d466a /doc/development/testing.md | |
| parent | 83259875939958c6288066a3a4e59a5062b4c9e6 (diff) | |
| parent | ce5d1b6fd7ed1aea2d2a675414ba81be624f2bf1 (diff) | |
| download | gitlab-ce-29142-add-prometheus-integration-documentation.tar.gz | |
Merge branch 'master' into '29142-add-prometheus-integration-documentation'29142-add-prometheus-integration-documentation
# Conflicts:
# doc/install/requirements.md
Diffstat (limited to 'doc/development/testing.md')
| -rw-r--r-- | doc/development/testing.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/testing.md b/doc/development/testing.md index 9b545d7f0f1..5ac7b8dadeb 100644 --- a/doc/development/testing.md +++ b/doc/development/testing.md @@ -35,8 +35,8 @@ GitLab uses [Karma] to run its [Jasmine] JavaScript specs. They can be run on the command line via `bundle exec karma`. - JavaScript tests live in `spec/javascripts/`, matching the folder structure of - `app/assets/javascripts/`: `app/assets/javascripts/behaviors/autosize.js.es6` has a corresponding - `spec/javascripts/behaviors/autosize_spec.js.es6` file. + `app/assets/javascripts/`: `app/assets/javascripts/behaviors/autosize.js` has a corresponding + `spec/javascripts/behaviors/autosize_spec.js` file. - Haml fixtures required for JavaScript tests live in `spec/javascripts/fixtures`. They should contain the bare minimum amount of markup necessary for the test. |