diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-24 09:47:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-24 09:47:31 +0000 |
| commit | 1be8f7170c98b769e6ed8913642e754d6487f37c (patch) | |
| tree | 69e8429bc058235750cf21278c5ca1336df100df /doc/development | |
| parent | 8c6cd5eef39fb46e8b917b441f06f78d77a7cb4e (diff) | |
| parent | e9a3ac2818581a5d612baf1c9807074176e2bf94 (diff) | |
| download | gitlab-ce-1be8f7170c98b769e6ed8913642e754d6487f37c.tar.gz | |
Merge branch 'mention-new-frontend-fixtures' into 'master'
Mention new mechanism to generate frontend fixtures
See merge request !10706
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/fe_guide/testing.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/development/fe_guide/testing.md b/doc/development/fe_guide/testing.md index 66afbf4db4d..157c13352ca 100644 --- a/doc/development/fe_guide/testing.md +++ b/doc/development/fe_guide/testing.md @@ -14,8 +14,10 @@ for more information on general testing practices at GitLab. GitLab uses the [Karma][karma] test runner with [Jasmine][jasmine] as its test framework for our JavaScript unit tests. For tests that rely on DOM -manipulation we use fixtures which are pre-compiled from HAML source files and -served during testing by the [jasmine-jquery][jasmine-jquery] plugin. +manipulation, we generate HTML files using RSpec suites (see `spec/javascripts/fixtures/*.rb` for examples). +Some fixtures are still HAML templates that are translated to HTML files using the same mechanism (see `static_fixtures.rb`). +Those will be migrated over time. +Fixtures are served during testing by the [jasmine-jquery][jasmine-jquery] plugin. JavaScript tests live in `spec/javascripts/`, matching the folder structure of `app/assets/javascripts/`: `app/assets/javascripts/behaviors/autosize.js` |