Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-24 12:47:31 +0300
committerRémy Coutable <remy@rymai.me>2017-04-24 12:47:31 +0300
commit1be8f7170c98b769e6ed8913642e754d6487f37c (patch)
tree69e8429bc058235750cf21278c5ca1336df100df /doc
parent8c6cd5eef39fb46e8b917b441f06f78d77a7cb4e (diff)
parente9a3ac2818581a5d612baf1c9807074176e2bf94 (diff)
Merge branch 'mention-new-frontend-fixtures' into 'master'
Mention new mechanism to generate frontend fixtures See merge request !10706
Diffstat (limited to 'doc')
-rw-r--r--doc/development/fe_guide/testing.md6
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`