From 00db78214c82a21f6adabc6e79f65c749730b8bc Mon Sep 17 00:00:00 2001 From: Winnie Hellmann <winnie@gitlab.com> Date: Tue, 12 Mar 2019 10:54:43 +0100 Subject: [PATCH] Remove static HAML fixtures from frontend testing guide --- doc/development/testing_guide/frontend_testing.md | 9 +++------ spec/javascripts/fixtures/static/README.md | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 spec/javascripts/fixtures/static/README.md diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md index d4a2ac246c4bb..3634e648219d5 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 diff --git a/spec/javascripts/fixtures/static/README.md b/spec/javascripts/fixtures/static/README.md new file mode 100644 index 0000000000000..b5c2f8233bff9 --- /dev/null +++ b/spec/javascripts/fixtures/static/README.md @@ -0,0 +1,3 @@ +# Please do not add new files here! + +Instead use a Ruby file in the fixtures root directory (`spec/javascripts/fixtures/`). -- GitLab