summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-11 16:33:57 +0200
committerRémy Coutable <remy@rymai.me>2017-10-11 16:33:57 +0200
commit9e5cb67e9db6c30f550697eabb3fd3a891be3a0d (patch)
tree25800608a3d164ed072d1e87cfa87e99440f5ec3
parent5a2acfe036b4ce2c74b015101c57f040b851899c (diff)
downloadgitlab-ce-docs/fix-dev-doc.tar.gz
Fix a missing link and create a separate "Testing guides" sectiondocs/fix-dev-doc
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--doc/development/README.md6
-rw-r--r--doc/development/testing_guide/index.md1
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/development/README.md b/doc/development/README.md
index e2d0c6c2056..36096842344 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -21,7 +21,6 @@
## Backend guides
-- [Testing standards and style guidelines](testing_guide/index.md)
- [API styleguide](api_styleguide.md) Use this styleguide if you are
contributing to the API.
- [Sidekiq guidelines](sidekiq_style_guide.md) for working with Sidekiq workers
@@ -67,6 +66,11 @@
- [Ordering table columns](ordering_table_columns.md)
- [Verifying database capabilities](verifying_database_capabilities.md)
+## Testing guides
+
+- [Testing standards and style guidelines](testing_guide/index.md)
+- [Frontend testing standards and style guidelines](testing_guide/frontend_testing.md)
+
## Documentation guides
- [Documentation styleguide](doc_styleguide.md): Use this styleguide if you are
diff --git a/doc/development/testing_guide/index.md b/doc/development/testing_guide/index.md
index 38b1fe1a193..8045bbad7ba 100644
--- a/doc/development/testing_guide/index.md
+++ b/doc/development/testing_guide/index.md
@@ -84,6 +84,7 @@ test should be re-implemented using RSpec instead.
[^1]: /ci/yaml/README.html#dependencies
+[rails]: http://rubyonrails.org/
[RSpec]: https://github.com/rspec/rspec-rails#feature-specs
[Capybara]: https://github.com/teamcapybara/capybara
[Karma]: http://karma-runner.github.io/