diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-03-19 22:41:25 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-03-19 22:41:25 +0000 |
| commit | 8046cedee3f596c87e93b1633dd5fe9c9a357b02 (patch) | |
| tree | 75a2e76d7f9f7c88f2160c0535e5c11a4ecb7f55 /doc | |
| parent | 53b92141b53b5a1dde33bc466457a2af29422ea6 (diff) | |
| parent | 28961d6abb15d663e91c5ed285700e29dad6b54e (diff) | |
| download | gitlab-ce-8046cedee3f596c87e93b1633dd5fe9c9a357b02.tar.gz | |
Merge branch 'winh-remove-static-fixtures' into 'master'
Remove static JavaScript HAML fixtures
Closes #24753
See merge request gitlab-org/gitlab-ce!26019
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/testing_guide/frontend_testing.md | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md index d4a2ac246c4..3634e648219 100644 --- a/doc/development/testing_guide/frontend_testing.md +++ b/doc/development/testing_guide/frontend_testing.md @@ -53,12 +53,9 @@ Remember that the performance of each test depends on the environment. ## Karma test suite GitLab uses the [Karma][karma] test runner with [Jasmine] as its test -framework for our JavaScript unit and integration tests. For integration tests, -we generate HTML files using RSpec (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`). -Adding these static fixtures should be avoided as they are harder to keep up to date with real views. -The existing static fixtures will be migrated over time. -Please see [gitlab-org/gitlab-ce#24753](https://gitlab.com/gitlab-org/gitlab-ce/issues/24753) to track our progress. +framework for our JavaScript unit and integration tests. +We generate HTML and JSON fixtures from backend views and controllers +using RSpec (see `spec/javascripts/fixtures/*.rb` for examples). Fixtures are served during testing by the [jasmine-jquery][jasmine-jquery] plugin. JavaScript tests live in `spec/javascripts/`, matching the folder structure |